aofs-08 #526 (aofs-08)