added form-group-vertical in case of nested form groups
merged with develop
merged with develop