aofs-07 #264 (aofs-07)