Add generalized dev flags support
Merge pull request #1760 from ussuri/generalized-flag-support

Add generalized dev flags support