Copy recently merged Bullseye changes that were missing in Trixie. This keeps both branches aligned, with only Trixie-specific differences remaining. Change-Id: I35a2ec968f2213133cab4c973135a18dcdb5d664 Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>