Merge branch 'mlutfy-dev-issue-645-1' into development. Fixes #645