Backport !7469 (Fix unexpected split calls) to v16-release
Backports !7469 (merged) to v16-release.
In addition to that, it adds a missing changelog commit for !7469 (merged).
Edited by Victor Allombert
Backports !7469 (merged) to v16-release.
In addition to that, it adds a missing changelog commit for !7469 (merged).