Please see my comment in #24505 (closed) for additional info
cc @imatlopez, @kyle.edwards, @brad.king