ZF-6698: Add support for Character Substitution

Description

Add support for new Character Substitution.

Comments

New feature added with r15686