aofs-11 #595 (aofs-11)