Merge "Implement new blocking"