no-merge: composite PR of #1969 and #1970#1971

kittaakos wants to merge 2 commits intomainarduino/arduino-ide:mainfrom

reproduce-1791-with-fixarduino/arduino-ide:reproduce-1791-with-fixCopy head branch name to clipboard