aofs-07 #403 (aofs-07)