Merge remote-tracking branch 'upstream/master' into sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear
