merge Stable/icehouse to local copy

5 commits from https://github.com/sdague