aofs-11 #607 (aofs-11)