Merge remote-tracking branch 'origin/bugfix/16462-16458-stretch-9.8-linux-4.19.20+force-all-tests' into stable Fix-committed: #16462, #16458
