aofs-11 #345 (aofs-11)