Merge branch 'fix/issue_433' into 'develop'