Acceptance changes
(squashed)