Upgrade to 5.3-SNAPSHOT