wzg fixed bug 8617 8699 8687 8372