Final tooling for rev 4.9