Merge pull request #3887 from akoeplinger/networkcredential-securestring