Merge branch 'main' into 1066-enhance-the-mode-enforcement-functionality-force-to-include-support-for-read-write-operations