Add PR #1851 from the framework
Fix the unit tests
Args is a public var
Merge pull request #11 from wilsonge/master

Add PR #1851 from the platform