Merge remote-tracking branch 'origin/master' into web/15968-donation-banner