Merge pull request #10454 from bkleiner/add-tbs-lucid-h7