cleanup: merge and rebase helpers
Remove tags ignore
Merge branch 'master' into kg-breaking-uncommitted-changes