Added way to control form-group bc compat