Merge latest updates from the development branch