fix error while single access
Merge branch 'i18797' into development