Merge "Improve branch cutting scripts"