R-3.6-branch