Merge branch 'SLING-7788'