Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-20170906' into staging