Integrating some common changes.