Merge branch 'release/2.2.8' into develop
removed required attribute and updated UI
Merge branch 'develop'