Merge "Fix bug when creating SRG termination points"