Safety check on collected tickets
Merge branch 'master' into production