aofs-11 #338 (aofs-11)