aofs-11 #337 (aofs-11)