Improved reading values from registry
Merge branch 'release/2.47'