Merge "Explicitly set generate_hashtree: false" into sc-dev