v0.55 rc2 back to master