Fix critical data release vulnerability
Merge branch 'production' into staging