Merge pull request #29 from apache/SLING-11461

SLING-11461 : Reduce complexity