Merge branch 'master' into lukeh/acquire-cred-ex-moonshot-integ