Merge branch 'r-ml-master' into t-master