aofs-11 #641 (aofs-11)