I'm gonna sound needy but that would be better between the DEPS and the CT options, same order as the table above. Also please take this opportunity to rebase so I can do a clean merge.