aofs-08 #522 (aofs-08)