v23 merged