Merge "Adding option to disable BDs for L3 only case"