[sr-dev] git:master:921cb9f8: Merge pull request #1048 from jchavanton/usrloc_params