3 files changed, 45 insertions, 0 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 3d3ed65a65..325293f35d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -1083,6 +1083,7 @@ testExtensionAdditionGroup(Config, Rule, Opts) ->
                                  [debug_info]),
     extensionAdditionGroup:run([Rule|Opts]),
     extensionAdditionGroup:run2([Rule|Opts]),
+    extensionAdditionGroup:run3(),
     asn1_test_lib:compile("EUTRA-RRC-Definitions", Config, [Rule, {record_name_prefix, "RRC-"}|Opts]),
     extensionAdditionGroup:run3([Rule|Opts]).
 
diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
index 55124f9449..b7cc74ab07 100644
--- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -95,6 +95,27 @@ AS-Config ::=				SEQUENCE {
 	]]
 }
 
+SystemInformationBlockType2 ::= SEQUENCE {
+  timeAlignmentTimerCommon TimeAlignmentTimer,
+  ...,
+  lateNonCriticalExtension OCTET STRING OPTIONAL,
+  [[ ssac-BarringForMMTEL-Voice-r9 AC-BarringConfig OPTIONAL,
+     ssac-BarringForMMTEL-Video-r9 AC-BarringConfig OPTIONAL
+  ]],
+  [[ ac-BarringForCSFB-r10 AC-BarringConfig OPTIONAL
+  ]]
+}
+
+TimeAlignmentTimer ::= ENUMERATED {
+  sf500, sf750, sf1280, sf1920, sf2560, sf5120,
+  sf10240, infinity}
 
+AC-BarringConfig ::= SEQUENCE {
+  ac-BarringFactor ENUMERATED {
+    p00, p05, p10, p15, p20, p25, p30, p40,
+    p50, p60, p70, p75, p80, p85, p90, p95},
+  ac-BarringTime ENUMERATED {s4, s8, s16, s32, s64, s128, s256, s512},
+  ac-BarringForSpecialAC BIT STRING (SIZE(5))
+}
 
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 5fcec23756..8148381d92 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -130,3 +130,26 @@ run3(Erule) ->
 	_ -> exit({expected,Val, got, Val2})
     end.
 
+run3() ->
+    SI = #'SystemInformationBlockType2'{
+            timeAlignmentTimerCommon = sf500,
+            lateNonCriticalExtension = asn1_NOVALUE,
+            'ssac-BarringForMMTEL-Voice-r9' = asn1_NOVALUE,
+            'ssac-BarringForMMTEL-Video-r9' = asn1_NOVALUE,
+	    'ac-BarringForCSFB-r10' = asn1_NOVALUE},
+    Barring = #'AC-BarringConfig'{
+                 'ac-BarringFactor' = p00,
+                 'ac-BarringTime' = s4,
+                 'ac-BarringForSpecialAC' = [0,0,0,0,0]},
+    roundtrip(SI),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ssac-BarringForMMTEL-Voice-r9'=Barring}),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ssac-BarringForMMTEL-Video-r9'=Barring}),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ac-BarringForCSFB-r10'=Barring}).
+
+roundtrip(V) ->
+    Mod = 'Extension-Addition-Group',
+    {ok,E} = Mod:encode('SystemInformationBlockType2', V),
+    {ok,V} = Mod:decode('SystemInformationBlockType2', iolist_to_binary(E)).