Merge "ActionButtonModel refactor" into main