Updates from cnsa/merqlove.