Merge "Revert "Fix proxy model""