Merge pull request #3891 from pks-t/pks/stransport-memory-management-improvements stransport memory management improvements