merge 9762 from trunk in attempt to resolve build issue blocking fixes for TABINF-4075