cherry-picked: Update to 0.17

Approved by:	maintainer timeout