manually merged requirev2 branch