aofs-07 #485 (aofs-07)