Reintegrate updates into fork