Merge latest updates from dev branch