aofs-07 #457 (aofs-07)