Latest changes before group merge.