[#1251] view proxy sort out
fix merge issue in branch