aofs-07 #497 (aofs-07)