Backported changes for ATEM 4.2