MAVEN-120

Hi Mika, Can you take a look into this ? thanks