Merged recent changes.