Update version information
Merge changes
Fix build break