Fixed broken/split build
Merged dev