Looks like this is working as intended now, shall be shipped with
16.1.16 after an extra round of testing.