LPS-41825 Move to HotDeployListener