aofs-07 #522 (aofs-07)