aofs-07 #460 (aofs-07)