Merge commit 'v3.6' into fixes