Merge "Make actions editable" into 24D1-dev