aofs-07 #487 (aofs-07)