7560f62 merge fix3