Merge pull request #2480 from xizheyin/argument-sharing-and-isolation

Merge pull request #2480 from xizheyin/argument-sharing-and-isolation #5053