[master] Added a command line flag