aofs-07 #521 (aofs-07)