Merge remote-tracking branch 'origin/apple/stable/20190619' into stable