aofs-07 #541 (aofs-07)