Merge pull request #3353 from esdrubal/st-format