Move to 5.4-SNAPSHOT