aofs-08 #605 (aofs-08)