Cherry-pick [gh-15] to master.