Merge pull request #11964 from scardinius/core-56