Supersedes #5381
Co-authored-by: @ferdnyc
rebased onto aebe698e5969ce29208d700536e1e0395e7ab38e
rebased onto c2de90a1399e1a529b6694a182b9f0a8a0389a14
Pull-Request has been merged by ngompa
Supersedes #5381
Co-authored-by: @ferdnyc