aofs-11 #639 (aofs-11)