Adding the last revisions for icehouse