aofs-07 #417 (aofs-07)