Merge development branch changes

Merging to prepare for the latest release