Separator
Revert
Switch to using string.format for future compatibility
Stub out new properties
Merge