Cherry pick upstream changes#2821

rlubos merged 2 commits intonrfconnect:mainnrfconnect/sdk-zephyr:mainfrom

olivier-le-sage:cherry-pick-upstream-changesolivier-le-sage/sdk-zephyr:cherry-pick-upstream-changesCopy head branch name to clipboard