aofs-07 #502 (aofs-07)