aofs-07 #475 (aofs-07)