Add enable_logging as a parameter to measures
Merge remote-tracking branch 'origin/develop' into develop