[build]charry-picked edits from PR #37.