Merge branch 'remove-redundant-functions-and-use-generic-functions'