EUCA-8180 merging from dev/wwannemacher/tp-to-testing-with-lifecycle