Merge branch 'development'
Issue 18797 ui part completed
Merge branch 'i18797' into development