port 0.5.4 changelog to master