Merge "Fix for TerminationPointCreateCommand to insert a termination point, if not...