diff --git a/Gemfile b/Gemfile
index d47620a288..89cd388324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,6 +122,7 @@ group :development, :test do
   gem 'rack'
   gem 'rb-readline'
   gem 'rubocop', '~> 1.12.0', require: false
+  gem 'rubocop-ast', '<= 1.17.0', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rspec', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bdd12d1cb9..72b58fd8e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -591,6 +591,7 @@ DEPENDENCIES
   rqrcode (~> 0.10.1)
   rspec-rails (= 2.12.0)
   rubocop (~> 1.12.0)
+  rubocop-ast (<= 1.17.0)
   rubocop-performance
   rubocop-rails
   rubocop-rspec
diff --git a/NEWS.md b/NEWS.md
index 73f56c11f4..db8a57670f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -36,6 +36,7 @@ Development
 - Update browser version checker to allow Firefox/100.0 [#16415](https://github.com/CartoDB/cartodb/pull/16415)
 - Update analysis schemas after giving required permissions on user promotion [#16390](https://github.com/CartoDB/cartodb/pull/16390)
 - Add timeout for SQL API exports [#16377](https://github.com/CartoDB/cartodb/pull/16377)
+- Avoid deleting a user if it has shared entities [#16424](https://github.com/CartoDB/cartodb/pull/16424)
 - Remove all references to Spatial Data Catalog and Kepler GL maps in on-premises [#16293](https://github.com/CartoDB/cartodb/pull/16293)
 - Increase hard-limit of MAX_TABLES_PER_IMPORT [#16374](https://github.com/CartoDB/cartodb/pull/16374)
 - Guard code for vizjson users [#16267](https://github.com/CartoDB/cartodb/pull/16267)