[Backport ncs-v3.1-branch] Backport commits from #3094 and #3095.#3183

carlescufi merged 3 commits intoncs-v3.1-branchnrfconnect/sdk-zephyr:ncs-v3.1-branchfrom

backport-3095-to-ncs-v3.1-branchnrfconnect/sdk-zephyr:backport-3095-to-ncs-v3.1-branchCopy head branch name to clipboard