WIP: Rebase new upstream version
This should as well incorporate improvements already proposed in different merge requests, !2 (closed) and !1 (merged)
This should as well incorporate improvements already proposed in different merge requests, !2 (closed) and !1 (merged)