Merge crydust fork