Bug 3960

New configuration directives to fix bug #3960