Merge in changes for multiple platforms