@C-Lodder I've allowed myself to solve the conflict in file build/media_source/system/js/inlinehelp.es6.js which was caused by your other PR #42726 having been merged up meanwhile. I hope I've done it all right.
RTC as the previous human tests are still valid. The commit which invalidated the test count was just a branch update with a small easy conflict which I've resolved.
@dgrammatiko @Fedik can you have a look?