LPS-51796 Next batch of the lifecycle stuff