aofs-07 #491 (aofs-07)