Merge tag '0.5.0' into develop