POD-3957 issue with table insertion
POD-3761 fix for VO and touch devices