Merge remote-tracking branch 'origin/feature/edit-repetitive-events' into feature/edit-repetitive-events
CAL-684 update component and actions