Merge IJ-MR-4790 from kornilova/custom-shortcut-text