Merge branch 'hotfix/smashing-ticket'
smashing mag platinum
Merge branch 'hotfix/platin' into develop