Merge branch 'feat/issue-4873'