commit after mergeHg-commit: 10241f03f6e1b803b128de6327150b543ba007dd
Finish relocating characteristic into TSHg-commit: cf5b347dd9bd966bfb1f8fad7b43c8cd218a313d
1234