Some fixes and changes we make to master, should also be made to develop. This is a reminder to forwardport them by referencing this issue. - [x] #73 - [x] #113 - ~[ ] #123~ Did manually