Merge branch 'fix/issue-1676' into 'develop'