aofs-07 #472 (aofs-07)