ECMS-6518: Move feature to add-on