Issue 18797 ui part completed
fix error while single access
Merge branch 'i18797'