Re-merge previous changes