Merge "ice: Add code to support older implementation"