aofs-09 #577 (aofs-09)