Update for 0.3.114-SNAPSHOT