Fix for BUG_18
Fix for BUG_18
Fix for BUG_19
Merge remote branch 'upstream/develop' into develop
Fix for BUG_18: grid column width
Fixed incorrect UI component name
Merge remote branch 'upstream/develop' into develop