Merge branch 'ice-avoid-sleeping-scheduling-in-atomic-contexts'