Issue #8686 by tuj: Fixed some issues with pushing to client