Merge 'development' branch

Backport of pull request #729.