Merge branch 'hotfix' @tag: v3.6.1