Merge remote branch 'origin/7.8'