I have pushed an additional branch to the fork for #2411667 as I could not change the target of !5 to 2.0.x.
This branch contains the same changes as that MR but rebased onto 2.0.x.