Created by: meguiraun
the last PRs have introduced some bugs... I opened this PR as WIP so we are aware of it.