Upgrade to Om 5.0.2-SNAPSHOT