Merge Master into Experimental patch T1.05