aofs-07 #313 (aofs-07)