Manually merged 9e597f6 from master
Manually merged 77fbc02 from master
Manually merged 597805e from master
Manually merged 78c8a30 from master
Manually merged 306459b from master
Manually merged 55a287b from master
Manually merged 50fa7a3 from master
Manually merged 0f3ee44 from master
Manually merged 1cdee8b from master

(all have to do with 4k support)