Refactor the way we replace entity storage handlers.

Closes #3452414

Merge request reports

Loading