Merge "New maintenance script to clean up rows with invalid DB keys"