Bring platform/ up to date with r2.6.0 manually