Merge "Updated platform"