Update 5.7.3-SNAPSHOT to 5.8-SNAPSHOT