Merge pull request #42519 from lochana-chathura/master-fix-autoclose #1196

Job	Run time
Build with tests on Ubuntu	1h 13m 25s
Build with some tests on Windows	1h 24m 26s
Build with sonarcloud scan on Ubuntu	15m 48s
	2h 53m 39s

Provide feedback