Port to range-v3 1a6cc85 27_11_2014