update BR, enable/disable options to ensure stable featureset from build