Merge "Do not merge" into eclair