Current work checkpoint. See diff for details.
Merge branch 'develop' into feature/es-refactor