aofs-11 #354 (aofs-11)