Merge "Hide unused fields" into eclair