Merge branch 'SLING-11888'