Merge branch 'maint'

32 files changed, 597 insertions, 64 deletions

diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile
index c88327c615..ebf83bb475 100644
--- a/lib/megaco/Makefile
+++ b/lib/megaco/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2019. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -206,11 +206,18 @@ $(APP_TAR_FILE): $(APP_DIR)
 
 dialyzer_plt: $(DIA_PLT)
 
-$(DIA_PLT): 
+$(DIA_PLT): Makefile
 	@echo "Building $(APPLICATION) plt file"
 	@dialyzer --build_plt \
                   --output_plt $@ \
                   -r ../$(APPLICATION)/ebin \
+                     ../../lib/kernel/ebin \
+                     ../../lib/stdlib/ebin \
+                     ../../lib/runtime_tools/ebin \
+                     ../../lib/asn1/ebin \
+                     ../../lib/debugger/ebin \
+                     ../../lib/et/ebin \
+                     ../../erts/preloaded/ebin \
                   --output $(DIA_ANALYSIS) \
                   --verbose
 
diff --git a/lib/megaco/doc/src/megaco_edist_compress.xml b/lib/megaco/doc/src/megaco_edist_compress.xml
index 16443e469c..8461c59a00 100644
--- a/lib/megaco/doc/src/megaco_edist_compress.xml
+++ b/lib/megaco/doc/src/megaco_edist_compress.xml
@@ -43,8 +43,8 @@
       <name since="">Module:encode(R, Version) -> T</name>
       <fsummary>Encode (compress) a megaco component.</fsummary>
       <type>
-        <v>R = megaco_message() | transaction() | action_reply() | action_request() | command_request()</v>
-        <v>Version = integer()</v>
+	<v>R = megaco_encoder:megaco_message() | megaco_encoder:transaction() | megaco_encoder:action_reply() | megaco_encoder:action_request() | megaco_encoder:command_request()</v>
+        <v>Version = megaco_encoder:protocol_version()</v>
         <v>T = term()</v>
       </type>
       <desc>
@@ -57,8 +57,8 @@
       <fsummary>Decode (decompress) a megaco component.</fsummary>
       <type>
         <v>T = term()</v>
-        <v>Version = integer()</v>
-        <v>R = megaco_message() | transaction() | action_reply() | action_request() | command_request()</v>
+        <v>Version = megaco_encoder:protocol_version()</v>
+        <v>R = megaco_encoder:megaco_message() | megaco_encoder:transaction() | megaco_encoder:action_reply() | megaco_encoder:action_request() | megaco_encoder:command_request()</v>
       </type>
       <desc>
         <p>Decompress a megaco component. </p>
diff --git a/lib/megaco/doc/src/megaco_encoder.xml b/lib/megaco/doc/src/megaco_encoder.xml
index cc8270440b..0632a55d48 100644
--- a/lib/megaco/doc/src/megaco_encoder.xml
+++ b/lib/megaco/doc/src/megaco_encoder.xml
@@ -42,7 +42,16 @@
 
   <section>
     <title>DATA TYPES</title>
+    <note>
+      <p>Note that the actual definition of (some of) these records depend on
+      the megaco protocol version used. For instance, the
+      <c>'TransactionReply'</c> record
+      has two more fields in version 3, so a simple erlang type definition
+      cannot be made here. </p>
+    </note>
     <code type="none"><![CDATA[
+protocol_version() = integer()
+segment_no()       = integer()
 megaco_message() = #'MegacoMessage{}'
 transaction() = {transactionRequest,     transaction_request()}      |
                 {transactionPending,     transaction_reply()}        |
@@ -57,6 +66,8 @@ transaction_ack() = #'TransactionAck'{}
 segment_reply() = #'SegmentReply'{}
 action_request() = #'ActionRequest'{}
 action_reply() = #'ActionReply'{}
+command_request() = #'CommandRequest'{}
+error_desc()   = #'ErrorDescriptor'{}
     ]]></code>
 
     <marker id="encode_message"></marker>
diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml
index 198f2aa24c..56d4d51cde 100644
--- a/lib/megaco/doc/src/megaco_user.xml
+++ b/lib/megaco/doc/src/megaco_user.xml
@@ -165,7 +165,7 @@ protocol_version() = integer()    ]]></code>
   <funcs>
     <func>
       <name since="">handle_connect(ConnHandle, ProtocolVersion) -> ok | error | {error,ErrorDescr}</name>
-      <name since="">handle_connect(ConnHandle, ProtocolVersion, Extra]) -> ok | error | {error,ErrorDescr}</name>
+      <name since="">handle_connect(ConnHandle, ProtocolVersion, Extra) -> ok | error | {error,ErrorDescr}</name>
       <fsummary>Invoked when a new connection is established</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index c54c80351c..5fb7273b4a 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -107,6 +107,7 @@
 	megaco_udp,
 	megaco_udp_server,
 	megaco_udp_sup,
+	megaco_user,
 	megaco_user_default
        ]},
   {registered, [megaco_config, megaco_monitor, 
diff --git a/lib/megaco/src/app/megaco.erl b/lib/megaco/src/app/megaco.erl
index f0c209fd6c..9ed042401b 100644
--- a/lib/megaco/src/app/megaco.erl
+++ b/lib/megaco/src/app/megaco.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,6 +94,11 @@
 %% This is for XREF
 -deprecated([{format_versions, 1, eventually}]).
 
+-export_type([
+              void/0
+             ]).
+
+-type void() :: term().
 
 -include("megaco_internal.hrl").
 
@@ -686,13 +691,8 @@ sys_info() ->
     [{arch, SysArch}, {ver, SysVer}].
 
 os_info() ->
-    V = os:version(),
-    case os:type() of
-        {OsFam, OsName} ->
-            [{fam, OsFam}, {name, OsName}, {ver, V}];
-        OsFam ->
-            [{fam, OsFam}, {ver, V}]
-    end.
+    {OsFam, OsName} = os:type(),
+    [{fam, OsFam}, {name, OsName}, {ver, os:version()}].
     
 ms() ->    
     ms1().
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 5e9836dc48..fdbb42c2f8 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -141,6 +141,7 @@ encode_transaction(_EC, T, _AsnMod, _TransMod, _Type) ->
 			    TransMod :: atom(),
 			    Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, do_encode_transaction/5}). % Future compat
 do_encode_transaction([native], _Trans, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -173,6 +174,7 @@ do_encode_transaction(EC, _Trans, _AsnMod, _TransMod, _Type) ->
 			     TransMod :: atom(),
 			     Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, encode_action_requests/5}). % Future compat
 encode_action_requests([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -203,6 +205,7 @@ encode_action_requests(EC, _ARs, _AsnMod, _TransMod, _Type) ->
 			    TransMod :: atom(),
 			    Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, encode_action_request/5}). % Future compat
 encode_action_request([native], _AR, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -226,6 +229,8 @@ encode_action_request(EC, _AR, _AsnMod, _TransMod, _Type) ->
 %% Convert a ActionReply record into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
+
+-dialyzer({nowarn_function, encode_action_reply/5}). % Future compat
 encode_action_reply([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
index af97056d5d..f9e3fe39e3 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1715,7 +1715,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
index b543abe7c8..141225f501 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1715,7 +1715,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
index 827cb3920b..b27a0be26e 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1716,7 +1716,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
index 1fba60fed6..aba64bb9f2 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1325,7 +1325,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
index 45b9b32772..dd07f8b404 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1393,7 +1393,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
index f1482bc252..a8c4211235 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1728,7 +1728,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/engine/depend.mk b/lib/megaco/src/engine/depend.mk
index 96ee337e3a..ba919659db 100644
--- a/lib/megaco/src/engine/depend.mk
+++ b/lib/megaco/src/engine/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2003-2019. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -78,6 +78,10 @@ $(EBIN)/megaco_transport.$(EMULATOR): megaco_transport.erl
 
 $(EBIN)/megaco_user.$(EMULATOR): megaco_user.erl
 
+$(EBIN)/megaco_user.$(EMULATOR): megaco_user.erl \
+	../../include/megaco.hrl \
+	../../include/megaco_message_v1.hrl
+
 $(EBIN)/megaco_user_default.$(EMULATOR): megaco_user_default.erl \
 	../../include/megaco.hrl \
 	../../include/megaco_message_v1.hrl
diff --git a/lib/megaco/src/engine/megaco_edist_compress.erl b/lib/megaco/src/engine/megaco_edist_compress.erl
index 987a5ec717..968ab6f16e 100644
--- a/lib/megaco/src/engine/megaco_edist_compress.erl
+++ b/lib/megaco/src/engine/megaco_edist_compress.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,10 +25,21 @@
 
 -module(megaco_edist_compress).
 
--export([behaviour_info/1]).
+-callback encode(R, Version) -> T when
+      R       :: megaco_encoder:megaco_message() |
+                 megaco_encoder:transaction() | 
+                 megaco_encoder:action_reply() | 
+                 megaco_encoder:action_request() | 
+                 megaco_encoder:command_request(),
+      Version :: megaco_encoder:protocol_version(),
+      T       :: term().
+
+-callback decode(T, Version) -> R when
+      T       :: term(),
+      Version :: megaco_encoder:protocol_version() | dynamic,
+      R       :: megaco_encoder:megaco_message() |
+                 megaco_encoder:transaction() | 
+                 megaco_encoder:action_reply() | 
+                 megaco_encoder:action_request() | 
+                 megaco_encoder:command_request().
 
-behaviour_info(callbacks) ->
-    [{encode,2}, 
-     {decode,2}];
-behaviour_info(_) ->
-    undefined.
diff --git a/lib/megaco/src/engine/megaco_encoder.erl b/lib/megaco/src/engine/megaco_encoder.erl
index 7ade349083..dd5a3458fc 100644
--- a/lib/megaco/src/engine/megaco_encoder.erl
+++ b/lib/megaco/src/engine/megaco_encoder.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,14 +25,108 @@
 
 -module(megaco_encoder).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{encode_message,         3}, 
-     {decode_message,         3},
-     {decode_mini_message,    3},
-     {encode_transaction,     3},
-     {encode_action_requests, 3},
-     {encode_action_reply,    3}];
-behaviour_info(_) ->
-    undefined.
+-export_type([
+              protocol_version/0,
+              segment_no/0,
+              megaco_message/0,
+              transaction/0,
+              transaction_request/0,
+              transaction_pending/0,
+              transaction_reply/0,
+              transaction_response_ack/0,
+              transaction_ack/0,
+              segment_reply/0,
+              action_request/0,
+              action_reply/0,
+              command_request/0,
+              error_desc/0
+             ]).
+
+
+-include("megaco_message_internal.hrl").
+
+-type protocol_version() :: integer().
+-type segment_no()       :: integer().
+-type megaco_message() :: #'MegacoMessage'{}.
+-type transaction()    :: {transactionRequest,     transaction_request()}      |
+                          {transactionPending,     transaction_reply()}        |
+                          {transactionReply,       transaction_pending()}      |
+                          {transactionResponseAck, transaction_response_ack()} |
+                          {segmentReply,           segment_reply()}.
+-type transaction_request()      :: #'TransactionRequest'{}.
+-type transaction_pending()      :: #'TransactionPending'{}.
+%% The problem with TransactionReply is that its definition depend
+%% on which version of the protocol we are using. As of version 3,
+%% it has two more fields.
+%% -type transaction_reply()        :: #'TransactionReply'{}.
+-type transaction_reply()        :: {'TransactionReply', _, _} |
+                                    {'TransactionReply', _, _, _, _}.
+-type transaction_response_ack() :: [transaction_ack()].
+-type transaction_ack()          :: #'TransactionAck'{}.
+-type segment_reply()            :: #'SegmentReply'{}.
+%% -type action_request()           :: #'ActionRequest'{}.
+-type action_request()           :: {'ActionRequest', _, _, _, _}.
+%% -type action_reply()             :: #'ActionReply'{}.
+-type action_reply()             :: {'ActionReply', _, _, _}.
+%% -type command_request()           :: #'CommandRequest'{}.
+-type command_request()          :: {'CommandRequest', _, _, _}.
+-type error_desc()               :: #'ErrorDescriptor'{}.
+
+-callback encode_message(EncodingConfig,
+                         Version,
+                         Message) -> {ok, Bin} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      Message        :: megaco_message(),
+      Bin            :: binary(),
+      Error          :: term().
+
+-callback decode_message(EncodingConfig,
+                         Version,
+                         Bin) -> {ok, Message} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version() | dynamic,
+      Bin            :: binary(),
+      Message        :: megaco_message(),
+      Error          :: term().
+
+-callback decode_mini_message(EncodingConfig,
+                              Version,
+                              Bin) -> {ok, Message} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version() | dynamic,
+      Bin            :: binary(),
+      Message        :: megaco_message(),
+      Error          :: term().
+
+-callback encode_transaction(EncodingConfig,
+                             Version,
+                             Transaction) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      Transaction    :: transaction(),
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-callback encode_action_requests(EncodingConfig,
+                                 Version,
+                                 ARs) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      ARs            :: [action_request()],
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-callback encode_action_reply(EncodingConfig,
+                              Version,
+                              AR) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      AR             :: action_reply(),
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-optional_callbacks(
+   [
+    encode_action_reply/3 % Only used if segementation is used
+   ]).
diff --git a/lib/megaco/src/engine/megaco_messenger.erl b/lib/megaco/src/engine/megaco_messenger.erl
index 1d462b2140..2a9ecee2a7 100644
--- a/lib/megaco/src/engine/megaco_messenger.erl
+++ b/lib/megaco/src/engine/megaco_messenger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1391,7 +1391,7 @@ prepare_request(ConnData, T, Rest, AckList, ReqList, Extra) ->
             %% don't restart the reply_timer.
             ConnData2 = ConnData#conn_data{protocol_version = Version},
             ?report_trace(ConnData2, 
-			  "re-send trans reply", [T | {bytes, Bin}]),
+			  "re-send trans reply", [T, {bytes, Bin}]),
             case megaco_messenger_misc:send_message(ConnData2, true, Bin) of
 		{ok, _} ->
 		    ok;
diff --git a/lib/megaco/src/engine/megaco_user.erl b/lib/megaco/src/engine/megaco_user.erl
new file mode 100644
index 0000000000..47fb1a119d
--- /dev/null
+++ b/lib/megaco/src/engine/megaco_user.erl
@@ -0,0 +1,386 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+%%
+%%-------------------------------------------------------------------------
+%% Purpose: Megaco user behaviour module
+%%
+%% This callback functions are the default! Its possible for the user to
+%% provide a arbitrary number of "extra" arguments via the user_args
+%% config option.
+%% So, for instance, the handle_connect/2 could instead become
+%% handle_connect/4 if the user sets the user_args option to [foo, bar].
+%% This means that its impossible to define a proper behaviour.
+%% So what we do here is to define a behaviour with the "default interface"
+%% (the user_args option has the [] as the default value) and set them
+%% all to be optional!
+%%-------------------------------------------------------------------------
+
+-module(megaco_user).
+
+-export_type([
+              receive_handle/0,
+              conn_handle/0,
+              megaco_timer/0
+             ]).
+
+-include_lib("megaco/include/megaco.hrl").
+%% -include_lib("megaco/include/megaco_message_v1.hrl").
+
+-type receive_handle() :: #megaco_receive_handle{}.
+-type conn_handle()    :: #megaco_conn_handle{}.
+-type megaco_timer()   :: infinity | non_neg_integer() | #megaco_incr_timer{}.
+
+-callback handle_connect(ConnHandle, ProtocolVersion) -> 
+    ok | error | {error, ErrorDescr} when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+-callback handle_connect(ConnHandle, ProtocolVersion, Extra) -> 
+    ok | error | {error, ErrorDescr} when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Extra           :: term(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+
+-callback handle_disconnect(ConnHandle, ProtocolVersion, Reason) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Reason          :: term().
+
+-callback handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED) -> 
+    reply | {reply, ED} | no_reply | {no_reply, ED} when
+      ReceiveHandle   :: receive_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      DefaultED       :: megaco_encoder:error_desc(),
+      ED              :: megaco_encoder:error_desc().
+-callback handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED, Extra) -> 
+    reply | {reply, ED} | no_reply | {no_reply, ED} when
+      ReceiveHandle   :: receive_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      DefaultED       :: megaco_encoder:error_desc(),
+      ED              :: megaco_encoder:error_desc(),
+      Extra           :: term().
+
+-callback handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+-callback handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr, Extra) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc(),
+      Extra           :: term().
+
+-callback handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests) ->
+    Pending | Reply | ignore_trans_request when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ActionRequests  :: [megaco_encoder:action_request()],
+      Pending         :: {pending, ReqData},
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack,         AckData} |
+                         {handle_pending_ack, AckData} |
+                         {handle_sloppy_ack,  AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer,      megaco_timer()} |
+                         {send_handle,      term()} |
+                         {protocol_version, integer()}.
+-callback handle_trans_request(ConnHandle,
+                               ProtocolVersion,
+                               ActionRequests,
+                               Extra) ->
+    Pending | Reply | ignore_trans_request when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ActionRequests  :: [megaco_encoder:action_request()],
+      Extra           :: term(),
+      Pending         :: {pending, ReqData},
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack,         AckData} |
+                         {handle_pending_ack, AckData} |
+                         {handle_sloppy_ack,  AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer,      megaco_timer()} |
+                         {send_handle,      term()} |
+                         {protocol_version, integer()}.
+
+-callback handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData) ->
+    Reply when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack, AckData} |
+                         {handle_sloppy_ack, AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer, megaco_timer()} |
+                         {send_handle, term()} |
+                         {protocol_version, megaco_encoder:protocol_version()}.
+-callback handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData, Extra) ->
+    Reply when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ReqData         :: term(),
+      Extra           :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack, AckData} |
+                         {handle_sloppy_ack, AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer, megaco_timer()} |
+                         {send_handle, term()} |
+                         {protocol_version, megaco_encoder:protocol_version()}.
+
+-callback handle_trans_reply(ConnHandle,
+                             ProtocolVersion,
+                             UserReply,
+                             ReplyData) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      UserReply            :: Success | Failure,
+      ReplyData            :: term(),
+      Success              :: {ok, Result},
+      Result               :: TransactionResult | SegmentResult,
+      TransactionResult    :: [megaco_encoder:action_reply()],
+      SegmentResult        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               [megaco_encoder:action_reply()]},
+      Failure              :: {error, Reason} |
+                              {error, ReplyNo, Reason},
+      Reason               :: TransactionReason |
+                              SegmentReason |
+                              UserCancelReason |
+                              SendReason |
+                              OtherReason,
+      TransactionReason    :: megaco_encoder:error_desc(),
+      SegmentReason        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               megaco_encoder:error_desc()},
+      OtherReason          :: timeout |
+                              {segment_timeout, MissingSegments} |
+                              exceeded_recv_pending_limit | term(),
+      LastSegment          :: boolean(),
+      MissingSegments      :: [megaco_encoder:segment_no()],
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled,
+                               ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      ReplyNo              :: pos_integer().
+-callback handle_trans_reply(ConnHandle,
+                             ProtocolVersion,
+                             UserReply,
+                             ReplyData,
+                             Extra) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      UserReply            :: Success | Failure,
+      ReplyData            :: term(),
+      Extra                :: term(),
+      Success              :: {ok, Result},
+      Result               :: TransactionResult | SegmentResult,
+      TransactionResult    :: [megaco_encoder:action_reply()],
+      SegmentResult        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               [megaco_encoder:action_reply()]},
+      Failure              :: {error, Reason} |
+                              {error, ReplyNo, Reason},
+      Reason               :: TransactionReason |
+                              SegmentReason |
+                              UserCancelReason |
+                              SendReason |
+                              OtherReason,
+      TransactionReason    :: megaco_encoder:error_desc(),
+      SegmentReason        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               megaco_encoder:error_desc()},
+      OtherReason          :: timeout |
+                              {segment_timeout, MissingSegments} |
+                              exceeded_recv_pending_limit | term(),
+      LastSegment          :: boolean(),
+      MissingSegments      :: [megaco_encoder:segment_no()],
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled,
+                               ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      ReplyNo              :: pos_integer().
+
+
+-callback handle_trans_ack(ConnHandle,
+                           ProtocolVersion,
+                           AckStatus,
+                           AckData) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      AckStatus            :: ok | {error, Reason},
+      AckData              :: term(),
+      Reason               :: UserCancelReason | SendReason | OtherReason,
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled, ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      OtherReason          :: term().
+-callback handle_trans_ack(ConnHandle,
+                           ProtocolVersion,
+                           AckStatus,
+                           AckData,
+                           Extra) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      AckStatus            :: ok | {error, Reason},
+      AckData              :: term(),
+      Extra                :: term(),
+      Reason               :: UserCancelReason | SendReason | OtherReason,
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled, ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      OtherReason          :: term().
+
+-callback handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Trans           :: megaco_encoder:transaction_pending() |
+                         megaco_encoder:transaction_reply() |
+                         megaco_encoder:transaction_response_ack().
+-callback handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans, Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Trans           :: megaco_encoder:transaction_pending() |
+                         megaco_encoder:transaction_reply() |
+                         megaco_encoder:transaction_response_ack(),
+      Extra           :: term().
+
+-callback handle_trans_request_abort(ConnHandle,
+                                     ProtocolVersion,
+                                     TransNo,
+                                     Pid) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      Pid             :: undefined | pid().
+-callback handle_trans_request_abort(ConnHandle,
+                                     ProtocolVersion,
+                                     TransNo,
+                                     Pid,
+                                     Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      Pid             :: undefined | pid(),
+      Extra           :: term().
+
+-callback handle_segment_reply(ConnHandle,
+                               ProtocolVersion,
+                               TransNo,
+                               SegNo,
+                               SegCompl) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      SegNo           :: integer(),
+      SegCompl        :: asn1_NOVALUE | 'NULL'.
+-callback handle_segment_reply(ConnHandle,
+                               ProtocolVersion,
+                               TransNo,
+                               SegNo,
+                               SegCompl,
+                               Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      SegNo           :: megaco_encoder:segment_no(),
+      SegCompl        :: asn1_NOVALUE | 'NULL',
+      Extra           :: term().
+
+-optional_callbacks(
+   [
+    %% The actual number of arguments to *all* functions,
+    %% depend of the user_args config option.
+    handle_connect/2,
+    handle_connect/3,
+    handle_disconnect/3,
+    handle_syntax_error/3,
+    handle_syntax_error/4,
+    handle_message_error/3,
+    handle_message_error/4,
+    handle_trans_request/3,
+    handle_trans_request/4,
+    handle_trans_long_request/3,
+    handle_trans_long_request/4,
+    handle_trans_reply/4,
+    handle_trans_reply/5,
+    handle_trans_ack/4,
+    handle_trans_ack/5,
+    handle_unexpected_trans/3,
+    handle_unexpected_trans/4,
+    handle_trans_request_abort/4,
+    handle_trans_request_abort/5,
+    handle_segment_reply/5,
+    handle_segment_reply/6
+   ]).
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk
index b74a096e40..a7f82c1836 100644
--- a/lib/megaco/src/engine/modules.mk
+++ b/lib/megaco/src/engine/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
+# Copyright Ericsson AB 2001-2019. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 BEHAVIOUR_MODULES = \
 	megaco_edist_compress \
 	megaco_encoder \
+	megaco_user \
 	megaco_transport
 
 MODULES = \
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3a.hrl b/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
index db7507fd27..4f3c83c6c5 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2841,6 +2841,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3b.hrl b/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
index d5f29025c8..de64f8bbdf 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2862,6 +2862,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3c.hrl b/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
index 6452be25d0..f73318161f 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -3338,6 +3338,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v1.hrl b/lib/megaco/src/text/megaco_text_gen_v1.hrl
index 38a0f6fd6b..6da9ea94ff 100644
--- a/lib/megaco/src/text/megaco_text_gen_v1.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v1.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2303,6 +2303,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v2.hrl b/lib/megaco/src/text/megaco_text_gen_v2.hrl
index d9443fb2e1..23afa85800 100644
--- a/lib/megaco/src/text/megaco_text_gen_v2.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v2.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2689,6 +2689,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v3.hrl b/lib/megaco/src/text/megaco_text_gen_v3.hrl
index dc1f2b9665..e440ec6651 100644
--- a/lib/megaco/src/text/megaco_text_gen_v3.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v3.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -3353,6 +3353,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_mini_parser.hrl b/lib/megaco/src/text/megaco_text_mini_parser.hrl
index 487958af08..72d8168abf 100644
--- a/lib/megaco/src/text/megaco_text_mini_parser.hrl
+++ b/lib/megaco/src/text/megaco_text_mini_parser.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1167,6 +1167,7 @@ ensure_pathName({_TokenTag, _Line, Text}) ->
 %     #'PropertyParm'{name  = lists:reverse(Name),
 %                     value = [lists:reverse(Value)]}.
 
+-dialyzer({nowarn_function, ensure_uint/3}). % Future compat
 ensure_uint({_TokenTag, Line, Val}, Min, Max) when is_integer(Val) ->
     if
         is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
index edda850c3a..d7e847993a 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1589,6 +1589,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
index 4eaa3733c4..479f963c70 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1635,6 +1635,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
index d2faad09d9..3ed9582308 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1898,6 +1898,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v1.hrl b/lib/megaco/src/text/megaco_text_parser_v1.hrl
index f48ac745f0..3a19debba0 100644
--- a/lib/megaco/src/text/megaco_text_parser_v1.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v1.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1337,6 +1337,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v2.hrl b/lib/megaco/src/text/megaco_text_parser_v2.hrl
index f3c2f69193..270541d111 100644
--- a/lib/megaco/src/text/megaco_text_parser_v2.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v2.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1563,6 +1563,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v3.hrl b/lib/megaco/src/text/megaco_text_parser_v3.hrl
index 38822e4952..7b8fff2080 100644
--- a/lib/megaco/src/text/megaco_text_parser_v3.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v3.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1920,6 +1920,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->