Merge "Revert "Revert "Refeactor region clearing / allocation code"""