Commetented blocking bug
Merge branch 'staging' into ref2014