Merged in changes from development repository.