MAVEN-124

Hi Mika, Could you review this fix? thanks