Merge pull request #467 from JCgH4164838Gh792C124B5/localS2_26_TextProvider_improvement_1

Proposed TextProvider feature addition (and cleanup)