Merge tag 'v0.4.5' into develop