aofs-11 #477 (aofs-11)