aofs-08 #610 (aofs-08)