Merge remote-tracking branch 'remotes/stsquad/tags/pull-misc-6.0-updates-170321-2...