Story 1.4: Land the pre-rebase cleanup as its own v1.3 commit
requested to merge feat/opea-1.5-upgrade/1-4-land-the-pre-rebase-cleanup-as-its-own-v1-3-commit into feat/opea-1.5-upgrade/prd
Sprint key: 1-4-land-the-pre-rebase-cleanup-as-its-own-v1-3-commit
Related to #872 (closed)