Use same linger value
Merge pull request #11876 from s0undt3ch/develop

Use same linger value