CORE-4713:
CORE-4713
CORE-4713: Implemented flag argument enhancement