aofs-07 #318 (aofs-07)