Pull request to bring 'development' in sync with 'master'.

This pull request ensures that the bug fixes made in the 'master' branch are reflected in the 'development' branch.