Fixing deadlock, Rebasing master to be pre-2.2.2