Hey @julienw, please ping me if you'd like to test these two patches merged on device, I can create a merged branch for you :)