merge with master
fix view test