Backport of avoid_es_loading_commits

Merge request reports

Loading