aofs-11 #605 (aofs-11)