Project: datamanagement
Issue DM-3562: Refactor executor code
Story points: 18