After proposal voting fix feb5

Please test thoroughly before merging ;) I did a lot of tests but not sure I caught all corner cases.