Merge branch 'main' into 1057-support-mode-enforcement-force-in-basop-framework