Merge branch 'chore/review-bot-cleanup-2.14.2' into dev

Backup: dev-backup at f2fe8f6e before this merge.