Bartosz, are you working on these changes? If you are busy with some other tasks, then we can close this PR for now and reopen it later when it's ready for further review and merge. That way, the PR queue will be in a maintainable state.