Resolve origin/dev into origin/master

Cherry pick of 54af5e431280df6c01847843332a5eb51a68099a to a7ef75b6326639a17bf63481a4fdec9a5dbc7848 into master with minor merge conflict resolution. dev will become obsolete after this. Please delete dev and re-branch it off origin/master.