aofs-11 #419 (aofs-11)