- Code refactoring and integrating develop branches (ES-114, ES-115,
ES-152)