Resolve TROVE-2020-005

This is tracked as #40080 (closed)

Edited by Nick Mathewson