ESSENTIALS-294: Small steps towards target...