aofs-07 #513 (aofs-07)