t2809: v0.8.6.2 release
Merge branch 'master' into qa-develop