aofs-08 #532 (aofs-08)