This verification may not always make sense, so removing
Merge branch 'master' into unstable_staging