STS-3198, STS-3196, STS-3195, STS-3191 Pushed fixes for all listed
issues to nightly build.