adding cool
Merge branch 'hotfix-bb002'