aofs-11 #575 (aofs-11)