Upgrade to Platform 0.87