peitili

@nvkelso I would like to point out that some recent changes introduced more integration tests failures. Attention that the linters check is important, if the linter tests failed it won't...

> See also #384 (which was reverted in #385 because it didn't actually work). thanks, definitely a non-trivial effort.