aofs-07 #272 (aofs-07)