Merge pull request #12306 from JO0st/dev-core-166