Merge tag 'backport/v4.1/staging-board-selected-to-v4.3' into backport/v4.1.12/snapshot