Merged cran branch