aofs-10 #485 (aofs-10)