Merged more stuff form master