Merge latest development changes.