I think all those 'merge branch master' merges might be the root cause of the issue. I generally find it cleaner to rebase topic branches to master rather than merging it.