1.2.4 => master

#1404 with all conflicts resolved and bugs fixed

```
git diff 68af6979785ac75cf8439c033aa7b18cc1e21394 faf66ef2c62995becd432f6dd2ea6aac80efbf21
```

should show differences only in build/