Nightly build
Merge fixes