Fix ice hang 2 rebase