diff --git a/components/lazreport/samples/Demo_CrossTab/project1.res b/components/lazreport/samples/Demo_CrossTab/project1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/components/lazreport/samples/Demo_CrossTab/project1.res and b/components/lazreport/samples/Demo_CrossTab/project1.res differ
diff --git a/components/lazreport/samples/Demo_CrossTab/unit1.lfm b/components/lazreport/samples/Demo_CrossTab/unit1.lfm
index 3c7df0cfc4..52b149e8a2 100644
--- a/components/lazreport/samples/Demo_CrossTab/unit1.lfm
+++ b/components/lazreport/samples/Demo_CrossTab/unit1.lfm
@@ -7,12 +7,12 @@ object Form1: TForm1
   ClientHeight = 368
   ClientWidth = 320
   OnCreate = FormCreate
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   object Button1: TButton
     Left = 112
     Height = 25
     Top = 56
-    Width = 92
+    Width = 97
     AutoSize = True
     Caption = 'Design report'
     OnClick = Button1Click
@@ -22,7 +22,7 @@ object Form1: TForm1
     Left = 112
     Height = 25
     Top = 120
-    Width = 84
+    Width = 90
     AutoSize = True
     Caption = 'Show report'
     OnClick = Button2Click
@@ -32,7 +32,7 @@ object Form1: TForm1
     Left = 16
     Height = 15
     Top = 8
-    Width = 130
+    Width = 117
     Caption = 'Croo-tab report demo'
     ParentColor = False
   end
@@ -40,7 +40,7 @@ object Form1: TForm1
     Left = 16
     Height = 15
     Top = 24
-    Width = 245
+    Width = 213
     Caption = 'Report used standart demo from firebird'
     ParentColor = False
   end
@@ -50,7 +50,6 @@ object Form1: TForm1
         Name = 'CUST_NO'
         DataType = ftInteger
         Precision = -1
-        Size = 0
       end    
       item
         Name = 'CUSTOMER'
@@ -62,7 +61,6 @@ object Form1: TForm1
         Name = 'ORDER_YEAR'
         DataType = ftSmallint
         Precision = -1
-        Size = 0
       end    
       item
         Name = 'TOTAL_VALUE'
@@ -83,6 +81,7 @@ object Form1: TForm1
       '  inner join CUSTOMER on (CUSTOMER.CUST_NO =  SALES.CUST_NO)'
       ''
     )
+    Options = []
     Params = <>
     left = 24
     top = 288
@@ -90,11 +89,12 @@ object Form1: TForm1
   object SQLTransaction1: TSQLTransaction
     Active = False
     Database = IBConnection1
+    Options = []
     left = 56
     top = 248
   end
   object IBConnection1: TIBConnection
-    Connected = True
+    Connected = False
     LoginPrompt = False
     DatabaseName = 'employee'
     KeepConnection = False
@@ -103,6 +103,7 @@ object Form1: TForm1
     UserName = 'sysdba'
     CharSet = 'utf8'
     HostName = '127.0.0.1'
+    Options = []
     left = 24
     top = 248
   end
diff --git a/components/lazreport/samples/Demo_CrossTab/unit1.pas b/components/lazreport/samples/Demo_CrossTab/unit1.pas
index 55460c4038..207648ece5 100644
--- a/components/lazreport/samples/Demo_CrossTab/unit1.pas
+++ b/components/lazreport/samples/Demo_CrossTab/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LR_Class, LR_Desgn, lr_CrossTab, Forms, Controls,
+  Classes, SysUtils, LR_Class, LR_Desgn, lr_CrossTab, Forms, Controls,
   Graphics, Dialogs, StdCtrls, sqldb, IBConnection;
 
 type
@@ -39,6 +39,9 @@ implementation
 
 {$R *.lfm}
 
+uses
+  LazFileUtils, LazUtf8;
+
 { TForm1 }
 
 procedure TForm1.Button1Click(Sender: TObject);
diff --git a/components/lazreport/samples/detail_reports/project1.res b/components/lazreport/samples/detail_reports/project1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/components/lazreport/samples/detail_reports/project1.res and b/components/lazreport/samples/detail_reports/project1.res differ
diff --git a/components/lazreport/samples/detail_reports/unit1.lfm b/components/lazreport/samples/detail_reports/unit1.lfm
index a110a85b31..1e86d7b290 100644
--- a/components/lazreport/samples/detail_reports/unit1.lfm
+++ b/components/lazreport/samples/detail_reports/unit1.lfm
@@ -6,16 +6,16 @@ object Form1: TForm1
   Caption = 'Form1'
   ClientHeight = 325
   ClientWidth = 482
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   object Button1: TButton
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = CheckBox2
     AnchorSideTop.Side = asrBottom
-    Left = 191
-    Height = 33
-    Top = 64
-    Width = 100
+    Left = 193
+    Height = 25
+    Top = 56
+    Width = 97
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Simple report'
@@ -26,9 +26,9 @@ object Form1: TForm1
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 23
+    Height = 19
     Top = 6
-    Width = 119
+    Width = 97
     BorderSpacing.Around = 6
     Caption = 'Show designer'
     TabOrder = 1
@@ -38,10 +38,10 @@ object Form1: TForm1
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = Button1
     AnchorSideTop.Side = asrBottom
-    Left = 130
-    Height = 33
-    Top = 103
-    Width = 222
+    Left = 144
+    Height = 25
+    Top = 87
+    Width = 195
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Report with SQL DB and Firebird'
@@ -53,9 +53,9 @@ object Form1: TForm1
     AnchorSideTop.Control = CheckBox1
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 23
-    Top = 35
-    Width = 117
+    Height = 19
+    Top = 31
+    Width = 98
     BorderSpacing.Around = 6
     Caption = 'Modal preview'
     Checked = True
@@ -68,10 +68,10 @@ object Form1: TForm1
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = Button2
     AnchorSideTop.Side = asrBottom
-    Left = 181
-    Height = 33
-    Top = 142
-    Width = 120
+    Left = 186
+    Height = 25
+    Top = 118
+    Width = 111
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Report with DBF'
@@ -83,10 +83,10 @@ object Form1: TForm1
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = Button3
     AnchorSideTop.Side = asrBottom
-    Left = 123
-    Height = 33
-    Top = 181
-    Width = 236
+    Left = 138
+    Height = 25
+    Top = 149
+    Width = 207
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Import template from spreadsheet'
@@ -123,12 +123,14 @@ object Form1: TForm1
     UserName = 'sysdba'
     CharSet = 'UTF8'
     HostName = '127.0.0.1'
+    Options = []
     left = 424
     top = 88
   end
   object SQLTransaction1: TSQLTransaction
     Active = False
     Database = IBConnection1
+    Options = []
     left = 424
     top = 133
   end
diff --git a/components/lazreport/samples/detail_reports/unit1.pas b/components/lazreport/samples/detail_reports/unit1.pas
index 7e79851485..abe91c11f8 100644
--- a/components/lazreport/samples/detail_reports/unit1.pas
+++ b/components/lazreport/samples/detail_reports/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LR_Class, LR_Desgn, LR_IBConnection, lrTDbfData,
+  Classes, SysUtils, LR_Class, LR_Desgn, LR_IBConnection, lrTDbfData,
   lrOfficeImport, Forms, Controls, Graphics, Dialogs, StdCtrls, IBConnection,
   sqldb;
 
@@ -47,7 +47,7 @@ var
   Form1: TForm1;
 
 implementation
-uses fpsallformats;
+uses fpsallformats, LazUtf8, LazFileUtils;
 
 {$R *.lfm}
 
diff --git a/components/lazreport/samples/editor/calleditorwithpkg.lpi b/components/lazreport/samples/editor/calleditorwithpkg.lpi
index 09d0c1ad02..ff8f32a6b1 100644
--- a/components/lazreport/samples/editor/calleditorwithpkg.lpi
+++ b/components/lazreport/samples/editor/calleditorwithpkg.lpi
@@ -26,7 +26,6 @@
           </Target>
           <SearchPaths>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
-            
           </SearchPaths>
           <CompileReasons Run="False"/>
         </CompilerOptions>
@@ -81,7 +80,6 @@
         <ComponentName Value="frmMain"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="maincalleditor"/>
       </Unit1>
       <Unit2>
         <Filename Value="custompreview.pas"/>
@@ -98,7 +96,6 @@
     </Target>
     <SearchPaths>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
-      
     </SearchPaths>
     <CompileReasons Run="False"/>
   </CompilerOptions>
diff --git a/components/lazreport/samples/editor/calleditorwithpkg.res b/components/lazreport/samples/editor/calleditorwithpkg.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/components/lazreport/samples/editor/calleditorwithpkg.res and b/components/lazreport/samples/editor/calleditorwithpkg.res differ
diff --git a/components/lazreport/samples/editor/maincalleditor.lfm b/components/lazreport/samples/editor/maincalleditor.lfm
index 2350912f08..6e5a43f1c7 100644
--- a/components/lazreport/samples/editor/maincalleditor.lfm
+++ b/components/lazreport/samples/editor/maincalleditor.lfm
@@ -5,20 +5,20 @@ object frmMain: TfrmMain
   Width = 828
   ActiveControl = Panel1
   Caption = 'LazReport Test Suite'
-  ClientHeight = 526
+  ClientHeight = 525
   ClientWidth = 828
   Font.Name = 'Sans'
   Menu = MainMenu1
   OnCloseQuery = FormCloseQuery
   OnCreate = frmMainCreate
   ShowHint = True
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   object lblIndex: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideBottom.Control = grid
     Left = 6
-    Height = 17
-    Top = 100
+    Height = 18
+    Top = 98
     Width = 36
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
@@ -29,10 +29,10 @@ object frmMain: TfrmMain
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = grid
-    Left = 751
-    Height = 17
-    Top = 100
-    Width = 71
+    Left = 744
+    Height = 18
+    Top = 98
+    Width = 78
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Expression'
@@ -40,8 +40,8 @@ object frmMain: TfrmMain
   end
   object sbar: TStatusBar
     Left = 0
-    Height = 19
-    Top = 507
+    Height = 23
+    Top = 502
     Width = 828
     Panels = <    
       item
@@ -57,12 +57,12 @@ object frmMain: TfrmMain
     AnchorSideRight.Control = lblExpr
     AnchorSideBottom.Control = grid
     Left = 48
-    Height = 27
+    Height = 26
     Top = 90
-    Width = 697
+    Width = 690
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 6
-    ItemHeight = 0
+    ItemHeight = 18
     OnSelect = comboIndexSelect
     TabOrder = 2
   end
@@ -73,8 +73,8 @@ object frmMain: TfrmMain
     AnchorSideRight.Control = grid
     AnchorSideBottom.Control = sbar
     Left = 0
-    Height = 384
-    Top = 123
+    Height = 380
+    Top = 122
     Width = 204
     Anchors = [akTop, akLeft, akBottom]
     Color = clMoneyGreen
@@ -92,8 +92,8 @@ object frmMain: TfrmMain
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = sbar
     Left = 0
-    Height = 384
-    Top = 123
+    Height = 380
+    Top = 122
     Width = 828
     Anchors = [akTop, akLeft, akRight, akBottom]
     Color = clWhite
@@ -124,14 +124,14 @@ object frmMain: TfrmMain
       Left = 6
       Height = 33
       Top = 6
-      Width = 118
+      Width = 116
       Action = accNewReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 0
     end
     object btnOpenReport: TButton
-      Left = 130
+      Left = 128
       Height = 33
       Top = 6
       Width = 123
@@ -141,27 +141,27 @@ object frmMain: TfrmMain
       TabOrder = 2
     end
     object btnEditReport: TButton
-      Left = 259
+      Left = 257
       Height = 33
       Top = 6
-      Width = 119
+      Width = 113
       Action = accEditReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 3
     end
     object btnPreviewReport: TButton
-      Left = 384
+      Left = 376
       Height = 33
       Top = 6
-      Width = 147
+      Width = 156
       Action = accPreviewReport
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 4
     end
     object btnPrintReport: TButton
-      Left = 537
+      Left = 538
       Height = 33
       Top = 6
       Width = 134
@@ -171,10 +171,10 @@ object frmMain: TfrmMain
       TabOrder = 5
     end
     object btnCustomPreview: TButton
-      Left = 677
+      Left = 678
       Height = 33
       Top = 6
-      Width = 145
+      Width = 144
       Action = accCustomPreview
       AutoSize = True
       BorderSpacing.Around = 6
@@ -185,7 +185,7 @@ object frmMain: TfrmMain
       Left = 6
       Height = 33
       Top = 45
-      Width = 118
+      Width = 116
       Action = accPrintGrid
       AutoSize = True
       BorderSpacing.Around = 6
@@ -193,7 +193,7 @@ object frmMain: TfrmMain
     end
     object btnComposite: TButton
       AnchorSideTop.Side = asrBottom
-      Left = 130
+      Left = 128
       Height = 33
       Top = 45
       Width = 123
@@ -205,20 +205,20 @@ object frmMain: TfrmMain
     object btnImageList: TButton
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 259
+      Left = 257
       Height = 33
       Top = 45
-      Width = 119
+      Width = 113
       Action = accThumbnails
       AutoSize = True
       BorderSpacing.Around = 6
       TabOrder = 7
     end
     object btnMasterDetail: TToggleBox
-      Left = 384
+      Left = 376
       Height = 33
       Top = 45
-      Width = 147
+      Width = 156
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'Master-Detail Test'
@@ -226,7 +226,7 @@ object frmMain: TfrmMain
       TabOrder = 9
     end
     object btnExportLast: TButton
-      Left = 537
+      Left = 538
       Height = 33
       Top = 45
       Width = 134
@@ -414,6 +414,7 @@ object frmMain: TfrmMain
     Font.Name = 'Sans'
     TitleFont.Name = 'Sans'
     Caption = 'Grid'
+    PrinterIndex = -1
     ShowCaption = True
     left = 352
     top = 248
diff --git a/components/lazreport/samples/editor/maincalleditor.pas b/components/lazreport/samples/editor/maincalleditor.pas
index 3f8317315a..bc93b71b84 100644
--- a/components/lazreport/samples/editor/maincalleditor.pas
+++ b/components/lazreport/samples/editor/maincalleditor.pas
@@ -172,7 +172,7 @@ var
 
 implementation
 
-uses gettext,translations;
+uses gettext,translations, lazutf8;
 
 {$R *.lfm}
 
diff --git a/components/lazreport/samples/enduser_reports/sql_demo/unit1.lfm b/components/lazreport/samples/enduser_reports/sql_demo/unit1.lfm
index 86fa931378..4409a5ead0 100644
--- a/components/lazreport/samples/enduser_reports/sql_demo/unit1.lfm
+++ b/components/lazreport/samples/enduser_reports/sql_demo/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 439
   ClientWidth = 515
   OnCreate = FormCreate
-  LCLVersion = '1.1'
+  LCLVersion = '1.7'
   object ListBox1: TListBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -17,22 +17,21 @@ object Form1: TForm1
     Left = 6
     Height = 427
     Top = 6
-    Width = 386
+    Width = 392
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     ItemHeight = 0
     ScrollWidth = 384
     TabOrder = 0
-    TopIndex = -1
   end
   object Button1: TButton
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
+    Left = 404
+    Height = 25
     Top = 6
-    Width = 111
+    Width = 105
     Anchors = [akTop, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -46,10 +45,10 @@ object Form1: TForm1
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Button1
     AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
-    Top = 39
-    Width = 111
+    Left = 404
+    Height = 25
+    Top = 37
+    Width = 105
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
@@ -63,10 +62,10 @@ object Form1: TForm1
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Button1
     AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
-    Top = 72
-    Width = 111
+    Left = 404
+    Height = 25
+    Top = 68
+    Width = 105
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
@@ -78,6 +77,7 @@ object Form1: TForm1
     Active = False
     Action = caNone
     Database = IBConnection1
+    Options = []
     left = 56
     top = 15
   end
@@ -91,6 +91,7 @@ object Form1: TForm1
     UserName = 'sysdba'
     HostName = '172.16.1.1'
     LogEvents = []
+    Options = []
     left = 24
     top = 15
   end
@@ -109,129 +110,6 @@ object Form1: TForm1
     DataType = dtDataSet
     left = 136
     top = 88
-    ReportForm = {
-      19000000
-    }
-  end
-  object frDesigner1: TfrDesigner
-    left = 176
-    top = 87
-  end
-end
-object Form1: TForm1
-  Left = 584
-  Height = 439
-  Top = 275
-  Width = 515
-  Caption = 'Report list'
-  ClientHeight = 439
-  ClientWidth = 515
-  OnCreate = FormCreate
-  LCLVersion = '1.1'
-  object ListBox1: TListBox
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = Button1
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 6
-    Height = 427
-    Top = 6
-    Width = 386
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Around = 6
-    ItemHeight = 0
-    ScrollWidth = 384
-    TabOrder = 0
-    TopIndex = -1
-  end
-  object Button1: TButton
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
-    Top = 6
-    Width = 111
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'Refresh reports'
-    OnClick = Button1Click
-    TabOrder = 1
-  end
-  object Button2: TButton
-    AnchorSideLeft.Control = Button1
-    AnchorSideTop.Control = Button1
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Button1
-    AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
-    Top = 39
-    Width = 111
-    Anchors = [akTop, akLeft, akRight]
-    AutoSize = True
-    BorderSpacing.Top = 6
-    Caption = 'Show report'
-    OnClick = Button2Click
-    TabOrder = 2
-  end
-  object Button3: TButton
-    AnchorSideLeft.Control = Button1
-    AnchorSideTop.Control = Button2
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Button1
-    AnchorSideRight.Side = asrBottom
-    Left = 398
-    Height = 27
-    Top = 72
-    Width = 111
-    Anchors = [akTop, akLeft, akRight]
-    AutoSize = True
-    BorderSpacing.Top = 6
-    Caption = 'Design report'
-    OnClick = Button3Click
-    TabOrder = 3
-  end
-  object SQLTransaction1: TSQLTransaction
-    Active = False
-    Action = caNone
-    Database = IBConnection1
-    left = 56
-    top = 15
-  end
-  object IBConnection1: TIBConnection
-    Connected = False
-    LoginPrompt = False
-    DatabaseName = 'employee.fdb'
-    KeepConnection = False
-    Password = 'masterkey'
-    Transaction = SQLTransaction1
-    UserName = 'sysdba'
-    HostName = '172.16.1.1'
-    LogEvents = []
-    left = 24
-    top = 15
-  end
-  object LR_IBConnection1: TLR_IBConnection
-    left = 24
-    top = 87
-  end
-  object LRDialogControls1: TLRDialogControls
-    left = 56
-    top = 87
-  end
-  object frReport1: TfrReport
-    InitialZoom = pzDefault
-    Options = []
-    PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbHelp, pbExit]
-    DataType = dtDataSet
-    left = 136
-    top = 88
-    ReportForm = {
-      19000000
-    }
   end
   object frDesigner1: TfrDesigner
     left = 176
diff --git a/components/lazreport/samples/enduser_reports/sql_demo/unit1.pas b/components/lazreport/samples/enduser_reports/sql_demo/unit1.pas
index f755dea1ca..fcbd68eab3 100644
--- a/components/lazreport/samples/enduser_reports/sql_demo/unit1.pas
+++ b/components/lazreport/samples/enduser_reports/sql_demo/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LR_PQConnection, LR_IBConnection,
+  Classes, SysUtils, LR_PQConnection, LR_IBConnection,
   LRDialogControls, LR_View, LR_Class, LR_Desgn, Forms, Controls, Graphics,
   Dialogs, StdCtrls, sqldb, IBConnection;
 
@@ -43,6 +43,9 @@ implementation
 
 {$R *.lfm}
 
+uses
+  LazFileUtils;
+
 { TForm1 }
 
 procedure TForm1.FormCreate(Sender: TObject);
diff --git a/components/lazreport/samples/enduser_reports/test_lr_formstorage/project1.res b/components/lazreport/samples/enduser_reports/test_lr_formstorage/project1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/components/lazreport/samples/enduser_reports/test_lr_formstorage/project1.res and b/components/lazreport/samples/enduser_reports/test_lr_formstorage/project1.res differ
diff --git a/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.lfm b/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.lfm
index cb889bb687..c470f85799 100644
--- a/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.lfm
+++ b/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.lfm
@@ -6,16 +6,16 @@ object Form1: TForm1
   Caption = 'Test form storage'
   ClientHeight = 240
   ClientWidth = 320
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   object Button1: TButton
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = Owner
     AnchorSideTop.Side = asrCenter
-    Left = 113
-    Height = 31
-    Top = 105
-    Width = 94
+    Left = 112
+    Height = 25
+    Top = 108
+    Width = 97
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Design report'
@@ -27,10 +27,10 @@ object Form1: TForm1
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = Button1
     AnchorSideTop.Side = asrBottom
-    Left = 116
-    Height = 31
-    Top = 142
-    Width = 89
+    Left = 115
+    Height = 25
+    Top = 139
+    Width = 90
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Show report'
diff --git a/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.pas b/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.pas
index 7c0247d6aa..31a333acef 100644
--- a/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.pas
+++ b/components/lazreport/samples/enduser_reports/test_lr_formstorage/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LR_Class, LR_Desgn, LRDialogControls, Forms,
+  Classes, SysUtils, LR_Class, LR_Desgn, LRDialogControls, Forms,
   Controls, Graphics, Dialogs, StdCtrls;
 
 type
@@ -33,6 +33,9 @@ implementation
 
 {$R *.lfm}
 
+uses
+  lazfileutils, lazutf8;
+
 { TForm1 }
 
 procedure TForm1.Button1Click(Sender: TObject);
diff --git a/components/lazreport/samples/report_url/unit1.lfm b/components/lazreport/samples/report_url/unit1.lfm
index 41a18585bb..93560da8ef 100644
--- a/components/lazreport/samples/report_url/unit1.lfm
+++ b/components/lazreport/samples/report_url/unit1.lfm
@@ -7,14 +7,14 @@ object Form1: TForm1
   ClientHeight = 240
   ClientWidth = 320
   OnCreate = FormCreate
-  LCLVersion = '1.1'
+  LCLVersion = '1.7'
   object Button1: TButton
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    Left = 118
-    Height = 27
+    Left = 115
+    Height = 25
     Top = 96
-    Width = 85
+    Width = 90
     AutoSize = True
     Caption = 'Show Demo'
     OnClick = Button1Click
@@ -23,10 +23,10 @@ object Form1: TForm1
   object Button2: TButton
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    Left = 123
-    Height = 27
+    Left = 120
+    Height = 25
     Top = 136
-    Width = 74
+    Width = 81
     AutoSize = True
     Caption = 'Edit Demo'
     OnClick = Button2Click
@@ -42,9 +42,6 @@ object Form1: TForm1
     OnMouseOverObject = frReport1MouseOverObject
     left = 24
     top = 17
-    ReportForm = {
-      1A000000
-    }
   end
   object frDesigner1: TfrDesigner
     left = 72
diff --git a/components/lazreport/samples/report_url/unit1.pas b/components/lazreport/samples/report_url/unit1.pas
index 7115e612c9..a4e20e3451 100644
--- a/components/lazreport/samples/report_url/unit1.pas
+++ b/components/lazreport/samples/report_url/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LR_Class, LR_Desgn, Forms, Controls, Graphics,
+  Classes, SysUtils, LR_Class, LR_Desgn, Forms, Controls, Graphics,
   Dialogs, StdCtrls;
 
 type
@@ -33,7 +33,7 @@ var
 
 implementation
 
-uses LazUTF8;
+uses LazUTF8, LazFileUtils;
 
 {$R *.lfm}
 
diff --git a/components/lazreport/samples/userds/unit2.pas b/components/lazreport/samples/userds/unit2.pas
index 4a605734cb..380de5a0d7 100644
--- a/components/lazreport/samples/userds/unit2.pas
+++ b/components/lazreport/samples/userds/unit2.pas
@@ -31,7 +31,7 @@ implementation
 
 procedure TForm2.FormShow(Sender: TObject);
 begin
-  memo1.lines.LoadFromFile(UTF8ToSys('notes.txt'));
+  memo1.lines.LoadFromFile('notes.txt');
 end;
 
 end.