MAVEN-73

Hey Mika, this fix requires all of the commits related too LPS-34537

The last commit that you will need is
1b614e8394532fa8634d1d2a91441f39c560923c