SONAR-3692 Fix issue with property set