Merge 0.5.4.0 to master