modified ? : cmd statements to use the getOptionValue(opt, defaultValue) instead
Merge remote-tracking branch 'origin/category' into category