Merge commit 'origin/7.8'