Fix 14424 and 14367
Merge pull request #127 from vishalduggal/timob-14424-31X

(3_1_X) Fix 14424 and 14367