Renamed RecorderProperties to Properties
Merge branch 'master' into shutdown
Updated code due to rename on other branch