r61 merge