Merge from Crydust fork