Merge pull request #11 from apache/SLING-9475-opt

SLING-9475: try to optimze the patch