This (or similar bug we were facing) seem to be fixed in 17.4.1 at least