Cherry picks for 0.5

This cherry-picks MR !53 (merged) and !54 (merged) from master into the release branch, without adding any extra commits that aren't necessary.