aofs-11 #638 (aofs-11)