minor adjustment to enableLogging to account for different serialized form
Merge branch 'dev' into test
Merge branch 'test' into prod