aofs-07 #477 (aofs-07)