Merge "Refeactor region clearing / allocation code"