Filter out 9980hashkey
Merge branch 'master' into staging