Merged in RELEASE_14 changes.