[sr-dev] git:master:6f872164: Merge branch 'master' into http_client_pkgtricks