Merge "BUG - 1756 - changed tableId's comparison"