Reintegrate recent changes