Updating develop for cross-hardware merge