Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev