[1.6.x] Fixed 21902 - additional substitutions.