aofs-09 #485 (aofs-09)