Description
Merge cherry-picked commit to fix #3847
Issue(s)
#3014 #3847
Test procedures
- Make a test build
- Perform full set of tests on test build
- Check the following defects are fixed
Check list
-
Self review -
Test procedure explained -
Tested on fresh install -
Tested applied as an update