Sync bugfixes from 4.4.6 backport#275

sebaszm merged 12 commits into

masterrdkcentral/ThunderTools:masterfrom

development/sync-toolsrdkcentral/ThunderTools:development/sync-toolsCopy head branch name to clipboard