Moved Freeze into correct post-merge location