not too happy about this hack, but it works for now
Merge branch 'master' into feature/dogfooding