Revert "Temporarily remove soop_trv map and data"

This reverts commit efe372b3866ea6269ad55c9f0695629a4b389b48.
Merge branch 'master' into production