aofs-11 #380 (aofs-11)