Merge "Merged-In Replace `main` function with `common_main` Remove unused imports Refactor code" into udc-qpr-dev