aofs-07 #404 (aofs-07)