Alpha 7.3.4

- fixed merge conflicts