[sr-dev] git:master: sms(s): merge changes from sms(k) ( log file refactorings and one security fix)