OOIION-1864: Fix deployment activation code - manual merge