merge from ipvr2014