oops forgot quickfix
Merge branch 'master' into feature/242/add-partner-tickets