Original merge request: https://framagit.org/vv221/play.it/merge_requests/249
Needs rebasing on 2.11.0