Merge branch 'hotfix/workflow-report-plugin' into 'feature/improve-performance-workflow-report'

# Conflicts:
#   plugins/workflow_report/lib/workflow_report.rb