Update from 3.6.x libraries and core.