as
Merge hotfix-add-stuff (#2) into stable

as

f f ff