2 0 stable catchup

Both of these need to be applied to 2-0-stable to get it to working state.
For some reason, the commit audit trail in master shows duplicate commits...