aofs-08 #562 (aofs-08)