[sr-dev] git:master: Rework fix for the static buffer overflow with the content of