Merge "Refine TetherSettings"