aofs-09 #578 (aofs-09)