Backport graphics fixes to 6.40#22021

linev wants to merge 3 commits intoroot-project:v6-40-00-patchesroot-project/root:v6-40-00-patchesfrom

linev:v640_fixeslinev/root:v640_fixesCopy head branch name to clipboard