Replace corner ring with text action
Merge remote-tracking branch 'origin/master'