Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170719' into staging