Merge "Fix Configuration.diff documentation."