Initial backporting changes for icehouse