Merge tag 'v0.4.4' into develop