bug fixed. #FTDUEDTR-1394
Merge branch 'improve-tabletool' into RB-7.4.0