bug #24095 ZoomIt refactoring