Apply fix for cmake issue #14766
Merge branch 'release'