aofs-07 #474 (aofs-07)