aofs-11 #634 (aofs-11)