Custom Text Value Plugin
Merge origin/master