Proper attribution for feature and bugfix

[ci skip]