Merge change 6506

* changes:
  Updated to better distinguish between options and operands