Bring in old commits from master

We are 11 commits behind. We need to go through them - cherry picking might be necessary.