Merge cool-feature back to trunk
Explain the final expected result.