Novell-2497

Novell-2497