[ivsc-firmware/f38: 5/5] Merge branch 'master' into f38