Merge branch 'staging' into OCF53-add-environment-variable-to-control-log-level