Merge branch 'fix/error-log-double-quotes' into 'develop'