Merge "Make actions editable" into main