ECMS-6518: Update moving add-on to feature