/* Added per ticket #839237 */