aofs-10 #541 (aofs-10)