[IN PROGRESS] Merge changes back to main branch#1

andriyun wants to merge 2 commits intomasterbellcom/os2datascanner:masterfrom

3.7.xbellcom/os2datascanner:3.7.xCopy head branch name to clipboard