Merge branch '20464-linux-6-1-99-force-all-tests' into 'devel'