Have to add drop views script back. bleh.
Merge branch 'master' into 19552