Merge branch 'feature/SLING-8428-mixin-linkedfile'