Merge the latest internal bug fixes and features