aofs-07 #447 (aofs-07)