Bring in v6.04 code