Preliminary merge. Integration is brancehd from fresh master.