aofs-09 #592 (aofs-09)