aofs-07 #578 (aofs-07)