Fix free ticket regression
Merge branch 'master' into staging