Merge pull request #7312 from omerap12/common-flags

Merge pull request #7312 from omerap12/common-flags #1542