aofs-08 #568 (aofs-08)