Implement final changes for ITI-1919