Some mistake in merge corrected.