Comment about thread safety of SystemInMock
Merge branch 'simplifyrecon' into develop
Update CHANGELOG.md