Merge v0.4.x

Merging changes from maintenance branch into development branch.