Merge commit 'v0.8.40'