Implement alternative finalization of deployment process (OMS-467)