merged with branch rv2013