Merge remote-tracking branch 'origin/2.3-maint' into 2.3-erie-tp