merge of R5RC1