Merge "Add protection on Xponder-in/out link creation"