aofs-07 #455 (aofs-07)