Prepare for merge with stb-tester main