Merge "Add PARAM_ALL setting for multi-option API parameters"