Issue #3467894 by rkoller: Unable to modify and save any tour tip for Core due to hyphenated machine-name
Closes #3467894