Closes #3071446
Merge request pipeline #161079 passed
#161083
Merge request pipeline passed for 602b2ae1 Apr 30, 2024
Will need an upgrade path for the removal of the keys
resolved all threads