Final sync with CHANGELOGs [ci skip]