Keep as 5.4.4-SNAPSHOT for possible bugs