aofs-11 #316 (aofs-11)