Align with the newer branch