Merge "Add configuration knob for Single Layer"