Merge pull request #3795 from athos-ribeiro/21-format-overflow
[2.1] Low: various: address format-overflow warnings