aofs-09 #522 (aofs-09)