Backports for 324

WIP