Merge "the final docker release for R6"