merge change to banhji_view