Rebasing fork from v0.4.3