2.2 merge 2.1

*Note:* This does not contain the changes in #2701, but will instead pave the way for it.