3 Commits (pr-2355-addendum)