Merge "Various improvements to shell code" into release-4-5-patches