Merge pull request #8391 from s0undt3ch/develop

ABOLISH un-indexed curly braces on strings to format!!!!
ABOLISH un-indexed curly braces on strings to format on Jenkins too!!!!