aofs-11 #349 (aofs-11)