aofs-07 #366 (aofs-07)