Upgrade to CM5..0.2