aofs-07 #481 (aofs-07)