Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/master' into develop
update release information
Update DLL
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop' into feature/remove_alternate_timing_method