Adding ICE undo feature

@jbau, @jrbl & @sefk - for reference when we roll new release branch