Merged updates from all forks