aofs-07 #483 (aofs-07)