[sr-dev] git:master: kamcmd changes