Merge latest updates

Merge the latest updates from the development branch.