Align with latest development version