aofs-11 #485 (aofs-11)