Merge code of ConvertIt proxy fbv and cbv views (WIP)