aofs-07 #476 (aofs-07)