[v0.5.3.6] Bug fix release