aofs-08 #485 (aofs-08)