Merge "Fix proxy model"