Query Execution oddities between SQL Server 2008r2, 2017 and 2019

Looks like this was fixed by Microsoft with one of the hotfixes to 2017. After enabling TF 4199, the execution plan switched back to what we expect.