aofs-07 #446 (aofs-07)