aofs-11 #516 (aofs-11)