Feature ready, put in dev mode, just a few details to be completed in the future (#2407).
Fixes #2175 (closed), #2398 (closed), #2395 (closed)