20 files changed, 545 insertions, 208 deletions
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index af27efa6c1..508a4fa2de 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -163,7 +163,7 @@ clean clean_docs:
 	rm -f errs core *~
 
 $(SPECDIR)/specs_erl_id_trans.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
 		-o$(dir $@) -module erl_id_trans
 
 # ----------------------------------------------------
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 14c543ee2b..68fa071090 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -90,8 +90,8 @@
 
   <section>
     <title>Other Storage Media</title>
-    <p>The <seealso marker="inets:ftp"><c>ftp</c></seealso>
-      module (Inets) normally accesses the tar file on disk using
+    <p>The <seealso marker="ftp:ftp"><c>ftp</c></seealso>
+      module normally accesses the tar file on disk using
       the <seealso marker="kernel:file"><c>file</c></seealso> module.
       When other needs arise, you can define your own low-level Erlang
       functions to perform the writing and reading on the storage media;
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 7bfe477a11..2a3785dc27 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -83,6 +83,8 @@
       </item>
       <item><seealso marker="#is_element/2"><c>is_element/2</c></seealso>
       </item>
+      <item><seealso marker="#is_empty/1"><c>is_empty/1</c></seealso>
+      </item>
       <item><seealso marker="#is_set/1"><c>is_set/1</c></seealso>
       </item>
       <item><seealso marker="#is_subset/2"><c>is_subset/2</c></seealso>
diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml
index 7b590932e4..2d891d7a5a 100644
--- a/lib/stdlib/doc/src/ordsets.xml
+++ b/lib/stdlib/doc/src/ordsets.xml
@@ -142,6 +142,15 @@
     </func>
 
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Test for empty set.</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Ordset</anno></c> is an empty set,
+          otherwise <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="is_set" arity="1"/>
       <fsummary>Test for an <c>Ordset</c>.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 4934bed365..1ed96ddc3f 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -140,6 +140,15 @@
     </func>
 
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Test for empty set.</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set,
+          otherwise <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="is_set" arity="1"/>
       <fsummary>Test for a <c>Set</c>.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index 130fc74a28..c7772d63a3 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -109,8 +109,10 @@
     <p>This module has been reworked in Erlang/OTP 20 to
     handle <seealso marker="unicode#type-chardata">
     <c>unicode:chardata()</c></seealso> and operate on grapheme
-    clusters. The <c>old functions</c> that only work on Latin-1 lists as input
-    are kept for backwards compatibility reasons but should not be used.
+    clusters. The <seealso marker="#oldapi"> <c>old
+    functions</c></seealso> that only work on Latin-1 lists as input
+    are still available but should not be used, they will be
+    deprecated in a future release.
     </p>
   </description>
 
@@ -629,5 +631,393 @@ ÖÄÅ</pre>
     </func>
 
   </funcs>
+
+  <section>
+    <marker id="oldapi"/>
+    <title>Obsolete API functions</title>
+    <p>Here follows the function of the old API.
+    These functions only work on a list of Latin-1 characters.
+    </p>
+    <note><p>
+      The functions are kept for backward compatibility, but are
+      not recommended.
+      They will be deprecated in Erlang/OTP 21.
+    </p>
+    <p>Any undocumented functions in <c>string</c> are not to be used.</p>
+    </note>
+  </section>
+
+  <funcs>
+    <func>
+      <name name="centre" arity="2"/>
+      <name name="centre" arity="3"/>
+      <fsummary>Center a string.</fsummary>
+      <desc>
+        <p>Returns a string, where <c><anno>String</anno></c> is centered in the
+          string and surrounded by blanks or <c><anno>Character</anno></c>.
+	  The resulting string has length <c><anno>Number</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#pad/3"><c>pad/3</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="chars" arity="2"/>
+      <name name="chars" arity="3"/>
+      <fsummary>Return a string consisting of numbers of characters.</fsummary>
+      <desc>
+        <p>Returns a string consisting of <c><anno>Number</anno></c> characters
+          <c><anno>Character</anno></c>. Optionally, the string can end with
+          string <c><anno>Tail</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="lists#duplicate/2"><c>lists:duplicate/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="chr" arity="2"/>
+      <fsummary>Return the index of the first occurrence of
+        a character in a string.</fsummary>
+      <desc>
+        <p>Returns the index of the first occurrence of
+          <c><anno>Character</anno></c> in <c><anno>String</anno></c>. Returns
+          <c>0</c> if <c><anno>Character</anno></c> does not occur.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#find/2"><c>find/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="concat" arity="2"/>
+      <fsummary>Concatenate two strings.</fsummary>
+      <desc>
+        <p>Concatenates <c><anno>String1</anno></c> and
+          <c><anno>String2</anno></c> to form a new string
+          <c><anno>String3</anno></c>, which is returned.</p>
+	<p>
+	  This function is <seealso marker="#oldapi">obsolete</seealso>.
+	  Use <c>[<anno>String1</anno>, <anno>String2</anno>]</c> as
+	  <c>Data</c> argument, and call
+	  <seealso marker="unicode#characters_to_list/2">
+	  <c>unicode:characters_to_list/2</c></seealso> or
+	  <seealso marker="unicode#characters_to_binary/2">
+	  <c>unicode:characters_to_binary/2</c></seealso>
+	  to flatten the output.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="copies" arity="2"/>
+      <fsummary>Copy a string.</fsummary>
+      <desc>
+        <p>Returns a string containing <c><anno>String</anno></c> repeated
+          <c><anno>Number</anno></c> times.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="lists#duplicate/2"><c>lists:duplicate/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="cspan" arity="2"/>
+      <fsummary>Span characters at start of a string.</fsummary>
+      <desc>
+        <p>Returns the length of the maximum initial segment of
+          <c><anno>String</anno></c>, which consists entirely of characters
+          not from <c><anno>Chars</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#take/3"><c>take/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:cspan("\t    abcdef", " \t").
+0</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="join" arity="2"/>
+      <fsummary>Join a list of strings with separator.</fsummary>
+      <desc>
+        <p>Returns a string with the elements of <c><anno>StringList</anno></c>
+          separated by the string in <c><anno>Separator</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="lists#join/2"><c>lists:join/2</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> join(["one", "two", "three"], ", ").
+"one, two, three"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="left" arity="2"/>
+      <name name="left" arity="3"/>
+      <fsummary>Adjust left end of a string.</fsummary>
+      <desc>
+        <p>Returns <c><anno>String</anno></c> with the length adjusted in
+          accordance with <c><anno>Number</anno></c>. The left margin is
+          fixed. If <c>length(<anno>String</anno>)</c> &lt;
+          <c><anno>Number</anno></c>, then <c><anno>String</anno></c> is padded
+          with blanks or <c><anno>Character</anno></c>s.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#pad/2"><c>pad/2</c></seealso> or
+	<seealso marker="#pad/3"><c>pad/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:left("Hello",10,$.).
+"Hello....."</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="len" arity="1"/>
+      <fsummary>Return the length of a string.</fsummary>
+      <desc>
+        <p>Returns the number of characters in <c><anno>String</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#length/1"><c>length/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="rchr" arity="2"/>
+      <fsummary>Return the index of the last occurrence of
+        a character in a string.</fsummary>
+      <desc>
+        <p>Returns the index of the last occurrence of
+          <c><anno>Character</anno></c> in <c><anno>String</anno></c>. Returns
+          <c>0</c> if <c><anno>Character</anno></c> does not occur.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#find/3"><c>find/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="right" arity="2"/>
+      <name name="right" arity="3"/>
+      <fsummary>Adjust right end of a string.</fsummary>
+      <desc>
+        <p>Returns <c><anno>String</anno></c> with the length adjusted in
+          accordance with <c><anno>Number</anno></c>. The right margin is
+          fixed. If the length of <c>(<anno>String</anno>)</c> &lt;
+          <c><anno>Number</anno></c>, then <c><anno>String</anno></c> is padded
+          with blanks or <c><anno>Character</anno></c>s.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#pad/3"><c>pad/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:right("Hello", 10, $.).
+".....Hello"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="rstr" arity="2"/>
+      <fsummary>Find the index of a substring.</fsummary>
+      <desc>
+        <p>Returns the position where the last occurrence of
+          <c><anno>SubString</anno></c> begins in <c><anno>String</anno></c>.
+          Returns <c>0</c> if <c><anno>SubString</anno></c>
+          does not exist in <c><anno>String</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#find/3"><c>find/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:rstr(" Hello Hello World World ", "Hello World").
+8</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="span" arity="2"/>
+      <fsummary>Span characters at start of a string.</fsummary>
+      <desc>
+        <p>Returns the length of the maximum initial segment of
+          <c><anno>String</anno></c>, which consists entirely of characters
+          from <c><anno>Chars</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#take/2"><c>take/2</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:span("\t    abcdef", " \t").
+5</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="str" arity="2"/>
+      <fsummary>Find the index of a substring.</fsummary>
+      <desc>
+        <p>Returns the position where the first occurrence of
+          <c><anno>SubString</anno></c> begins in <c><anno>String</anno></c>.
+          Returns <c>0</c> if <c><anno>SubString</anno></c>
+          does not exist in <c><anno>String</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#find/2"><c>find/2</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:str(" Hello Hello World World ", "Hello World").
+8</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="strip" arity="1"/>
+      <name name="strip" arity="2"/>
+      <name name="strip" arity="3"/>
+      <fsummary>Strip leading or trailing characters.</fsummary>
+      <desc>
+        <p>Returns a string, where leading or trailing, or both, blanks or a
+          number of <c><anno>Character</anno></c> have been removed.
+          <c><anno>Direction</anno></c>, which can be <c>left</c>, <c>right</c>,
+          or <c>both</c>, indicates from which direction blanks are to be
+          removed. <c>strip/1</c> is equivalent to
+          <c>strip(String, both)</c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#trim/3"><c>trim/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:strip("...Hello.....", both, $.).
+"Hello"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sub_string" arity="2"/>
+      <name name="sub_string" arity="3"/>
+      <fsummary>Extract a substring.</fsummary>
+      <desc>
+        <p>Returns a substring of <c><anno>String</anno></c>, starting at
+          position <c><anno>Start</anno></c> to the end of the string, or to
+          and including position <c><anno>Stop</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#slice/3"><c>slice/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+sub_string("Hello World", 4, 8).
+"lo Wo"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="substr" arity="2"/>
+      <name name="substr" arity="3"/>
+      <fsummary>Return a substring of a string.</fsummary>
+      <desc>
+        <p>Returns a substring of <c><anno>String</anno></c>, starting at
+          position <c><anno>Start</anno></c>, and ending at the end of the
+          string or at length <c><anno>Length</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#slice/3"><c>slice/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> substr("Hello World", 4, 5).
+"lo Wo"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sub_word" arity="2"/>
+      <name name="sub_word" arity="3"/>
+      <fsummary>Extract subword.</fsummary>
+      <desc>
+        <p>Returns the word in position <c><anno>Number</anno></c> of
+          <c><anno>String</anno></c>. Words are separated by blanks or
+          <c><anno>Character</anno></c>s.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#nth_lexeme/3"><c>nth_lexeme/3</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> string:sub_word(" Hello old boy !",3,$o).
+"ld b"</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="to_lower" arity="1" clause_i="1"/>
+      <name name="to_lower" arity="1" clause_i="2"/>
+      <name name="to_upper" arity="1" clause_i="1"/>
+      <name name="to_upper" arity="1" clause_i="2"/>
+      <fsummary>Convert case of string (ISO/IEC 8859-1).</fsummary>
+      <type variable="String" name_i="1"/>
+      <type variable="Result" name_i="1"/>
+      <type variable="Char"/>
+      <type variable="CharResult"/>
+      <desc>
+        <p>The specified string or character is case-converted. Notice that
+          the supported character set is ISO/IEC 8859-1 (also called Latin 1);
+          all values outside this set are unchanged</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso> use
+	<seealso marker="#lowercase/1"><c>lowercase/1</c></seealso>,
+	<seealso marker="#uppercase/1"><c>uppercase/1</c></seealso>,
+	<seealso marker="#titlecase/1"><c>titlecase/1</c></seealso> or
+	<seealso marker="#casefold/1"><c>casefold/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="tokens" arity="2"/>
+      <fsummary>Split string into tokens.</fsummary>
+      <desc>
+        <p>Returns a list of tokens in <c><anno>String</anno></c>, separated
+          by the characters in <c><anno>SeparatorList</anno></c>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> tokens("abc defxxghix jkl", "x ").
+["abc", "def", "ghi", "jkl"]</code>
+        <p>Notice that, as shown in this example, two or more
+          adjacent separator characters in <c><anno>String</anno></c>
+          are treated as one. That is, there are no empty
+          strings in the resulting list of tokens.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#lexemes/2"><c>lexemes/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="words" arity="1"/>
+      <name name="words" arity="2"/>
+      <fsummary>Count blank separated words.</fsummary>
+      <desc>
+        <p>Returns the number of words in <c><anno>String</anno></c>, separated
+          by blanks or <c><anno>Character</anno></c>.</p>
+	<p>This function is <seealso marker="#oldapi">obsolete</seealso>.
+	Use
+	<seealso marker="#lexemes/2"><c>lexemes/2</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> words(" Hello old boy!", $o).
+4</code>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>Notes</title>
+    <p>Some of the general string functions can seem to overlap each
+      other. The reason is that this string package is the
+      combination of two earlier packages and all functions of
+      both packages have been retained.</p>
+  </section>
+
 </erlref>
 
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 350847bf7d..53107ade2c 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -270,8 +270,8 @@
           <item>
             <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
               <anno>Arguments</anno>)</c> and measures the elapsed real time as 
-              reported by <seealso marker="kernel:os#timestamp/0">
-              <c>os:timestamp/0</c></seealso>.</p>
+              reported by <seealso marker="erts:erlang#monotonic_time/0">
+              <c>erlang:monotonic_time/0</c></seealso>.</p>
             <p>Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where
               <c><anno>Time</anno></c> is the elapsed real time in
               <em>microseconds</em>, and <c><anno>Value</anno></c> is what is
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 9a62d21d34..79dc6ce180 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -93,13 +93,6 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
          }).
 
 
-%% Are we outside or inside a catch or try/catch?
--type catch_scope() :: 'none'
-                     | 'after_old_catch'
-                     | 'after_try'
-                     | 'wrong_part_of_try'
-                     | 'try_catch'.
-
 %% Define the lint state record.
 %% 'called' and 'exports' contain {Line, {Function, Arity}},
 %% the other function collections contain {Function, Arity}.
@@ -144,9 +137,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                    :: dict:dict(ta(), #typeinfo{}),
                exp_types=gb_sets:empty()        %Exported types
                    :: gb_sets:set(ta()),
-               in_try_head=false :: boolean(),  %In a try head.
-               catch_scope = none               %Inside/outside try or catch
-                   :: catch_scope()
+               in_try_head=false :: boolean()  %In a try head.
               }).
 
 -type lint_state() :: #lint{}.
@@ -233,15 +224,6 @@ format_error({redefine_old_bif_import,{F,A}}) ->
 format_error({redefine_bif_import,{F,A}}) ->
     io_lib:format("import directive overrides auto-imported BIF ~w/~w~n"
 		  " - use \"-compile({no_auto_import,[~w/~w]}).\" to resolve name clash", [F,A,F,A]);
-format_error({get_stacktrace,wrong_part_of_try}) ->
-    "erlang:get_stacktrace/0 used in the wrong part of 'try' expression. "
-        "(Use it in the block between 'catch' and 'end'.)";
-format_error({get_stacktrace,after_old_catch}) ->
-    "erlang:get_stacktrace/0 used following an old-style 'catch' "
-        "may stop working in a future release. (Use it inside 'try'.)";
-format_error({get_stacktrace,after_try}) ->
-    "erlang:get_stacktrace/0 used following a 'try' expression "
-        "may stop working in a future release. (Use it inside 'try'.)";
 format_error({deprecated, MFA, ReplacementMFA, Rel}) ->
     io_lib:format("~s is deprecated and will be removed in ~s; use ~s",
 		  [format_mfa(MFA), Rel, format_mfa(ReplacementMFA)]);
@@ -591,10 +573,7 @@ start(File, Opts) ->
 		      false, Opts)},
 	 {missing_spec_all,
 	  bool_option(warn_missing_spec_all, nowarn_missing_spec_all,
-		      false, Opts)},
-         {get_stacktrace,
-          bool_option(warn_get_stacktrace, nowarn_get_stacktrace,
-                      true, Opts)}
+		      false, Opts)}
 	],
     Enabled1 = [Category || {Category,true} <- Enabled0],
     Enabled = ordsets:from_list(Enabled1),
@@ -1426,7 +1405,7 @@ call_function(Line, F, A, #lint{usage=Usage0,called=Cd,func=Func,file=File}=St)
 %% function(Line, Name, Arity, Clauses, State) -> State.
 
 function(Line, Name, Arity, Cs, St0) ->
-    St1 = St0#lint{func={Name,Arity},catch_scope=none},
+    St1 = St0#lint{func={Name,Arity}},
     St2 = define_function(Line, Name, Arity, St1),
     clauses(Cs, St2).
 
@@ -2367,7 +2346,7 @@ expr({call,Line,F,As}, Vt, St0) ->
 expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) ->
     %% Currently, we don't allow any exports because later
     %% passes cannot handle exports in combination with 'after'.
-    {Evt0,St1} = exprs(Es, Vt, St0#lint{catch_scope=wrong_part_of_try}),
+    {Evt0,St1} = exprs(Es, Vt, St0),
     TryLine = {'try',Line},
     Uvt = vtunsafe(TryLine, Evt0, Vt),
     Evt1 = vtupdate(Uvt, Evt0),
@@ -2379,12 +2358,11 @@ expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) ->
     {Avt0,St} = exprs(As, vtupdate(Evt2, Vt), St2),
     Avt1 = vtupdate(vtunsafe(TryLine, Avt0, Vt), Avt0),
     Avt = vtmerge(Evt2, Avt1),
-    {Avt,St#lint{catch_scope=after_try}};
+    {Avt,St};
 expr({'catch',Line,E}, Vt, St0) ->
     %% No new variables added, flag new variables as unsafe.
     {Evt,St} = expr(E, Vt, St0),
-    {vtupdate(vtunsafe({'catch',Line}, Evt, Vt), Evt),
-     St#lint{catch_scope=after_old_catch}};
+    {vtupdate(vtunsafe({'catch',Line}, Evt, Vt), Evt),St};
 expr({match,_Line,P,E}, Vt, St0) ->
     {Evt,St1} = expr(E, Vt, St0),
     {Pvt,Bvt,St2} = pattern(P, vtupdate(Evt, Vt), St1),
@@ -3223,7 +3201,7 @@ is_module_dialyzer_option(Option) ->
 
 try_clauses(Scs, Ccs, In, Vt, St0) ->
     {Csvt0,St1} = icrt_clauses(Scs, Vt, St0),
-    St2 = St1#lint{catch_scope=try_catch,in_try_head=true},
+    St2 = St1#lint{in_try_head=true},
     {Csvt1,St3} = icrt_clauses(Ccs, Vt, St2),
     Csvt = Csvt0 ++ Csvt1,
     UpdVt = icrt_export(Csvt, Vt, In, St3),
@@ -3243,7 +3221,7 @@ icrt_clauses(Cs, In, Vt, St0) ->
 icrt_clauses(Cs, Vt, St) ->
     mapfoldl(fun (C, St0) -> icrt_clause(C, Vt, St0) end, St, Cs).
 
-icrt_clause({clause,_Line,H,G,B}, Vt0, #lint{catch_scope=Scope}=St0) ->
+icrt_clause({clause,_Line,H,G,B}, Vt0, St0) ->
     Vt1 = taint_stack_var(Vt0, H, St0),
     {Hvt,Binvt,St1} = head(H, Vt1, St0),
     Vt2 = vtupdate(Hvt, Binvt),
@@ -3251,7 +3229,7 @@ icrt_clause({clause,_Line,H,G,B}, Vt0, #lint{catch_scope=Scope}=St0) ->
     {Gvt,St2} = guard(G, vtupdate(Vt3, Vt0), St1#lint{in_try_head=false}),
     Vt4 = vtupdate(Gvt, Vt2),
     {Bvt,St3} = exprs(B, vtupdate(Vt4, Vt0), St2),
-    {vtupdate(Bvt, Vt4),St3#lint{catch_scope=Scope}}.
+    {vtupdate(Bvt, Vt4),St3}.
 
 taint_stack_var(Vt, Pat, #lint{in_try_head=true}) ->
     [{tuple,_,[_,_,{var,_,Stk}]}] = Pat,
@@ -3736,8 +3714,7 @@ has_wildcard_field([]) -> false.
 check_remote_function(Line, M, F, As, St0) ->
     St1 = deprecated_function(Line, M, F, As, St0),
     St2 = check_qlc_hrl(Line, M, F, As, St1),
-    St3 = check_get_stacktrace(Line, M, F, As, St2),
-    format_function(Line, M, F, As, St3).
+    format_function(Line, M, F, As, St2).
 
 %% check_qlc_hrl(Line, ModName, FuncName, [Arg], State) -> State
 %%  Add warning if qlc:q/1,2 has been called but qlc.hrl has not
@@ -3786,23 +3763,6 @@ deprecated_function(Line, M, F, As, St) ->
 	    St
     end.
 
-check_get_stacktrace(Line, erlang, get_stacktrace, [], St) ->
-    case St of
-        #lint{catch_scope=none} ->
-            St;
-        #lint{catch_scope=try_catch} ->
-            St;
-        #lint{catch_scope=Scope} ->
-            case is_warn_enabled(get_stacktrace, St) of
-                false ->
-                    St;
-                true ->
-                    add_warning(Line, {get_stacktrace,Scope}, St)
-            end
-    end;
-check_get_stacktrace(_, _, _, _, St) ->
-    St.
-
 -dialyzer({no_match, deprecated_type/5}).
 
 deprecated_type(L, M, N, As, St) ->
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 14ca24362e..0c338b5952 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -1377,6 +1377,8 @@ normalise({map,_,Pairs}=M) ->
 		({map_field_assoc,_,K,V}) -> {normalise(K),normalise(V)};
 		(_) -> erlang:error({badarg,M})
 	    end, Pairs));
+normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}) ->
+    fun M:F/A;
 %% Special case for unary +/-.
 normalise({op,_,'+',{char,_,I}}) -> I;
 normalise({op,_,'+',{integer,_,I}}) -> I;
diff --git a/lib/stdlib/src/erl_posix_msg.erl b/lib/stdlib/src/erl_posix_msg.erl
index bfafca1ff7..8959fea498 100644
--- a/lib/stdlib/src/erl_posix_msg.erl
+++ b/lib/stdlib/src/erl_posix_msg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. 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.
@@ -64,6 +64,7 @@ message_1(eduppkg) -> <<"duplicate package name">>;
 message_1(eexist) -> <<"file already exists">>;
 message_1(efault) -> <<"bad address in system call argument">>;
 message_1(efbig) -> <<"file too large">>;
+message_1(eftype) -> <<"EFTYPE">>;
 message_1(ehostdown) -> <<"host is down">>;
 message_1(ehostunreach) -> <<"host is unreachable">>;
 message_1(eidrm) -> <<"identifier removed">>;
@@ -115,6 +116,7 @@ message_1(enopkg) -> <<"package not installed">>;
 message_1(enoprotoopt) -> <<"bad proocol option">>;
 message_1(enospc) -> <<"no space left on device">>;
 message_1(enosr) -> <<"out of stream resources or not a stream device">>;
+message_1(enostr) -> <<"not a stream">>;
 message_1(enosym) -> <<"unresolved symbol name">>;
 message_1(enosys) -> <<"function not implemented">>;
 message_1(enotblk) -> <<"block device required">>;
@@ -128,6 +130,7 @@ message_1(enotty) -> <<"inappropriate device for ioctl">>;
 message_1(enotuniq) -> <<"name not unique on network">>;
 message_1(enxio) -> <<"no such device or address">>;
 message_1(eopnotsupp) -> <<"operation not supported on socket">>;
+message_1(eoverflow) -> <<"offset too large for file system">>;
 message_1(eperm) -> <<"not owner">>;
 message_1(epfnosupport) -> <<"protocol family not supported">>;
 message_1(epipe) -> <<"broken pipe">>;
@@ -167,4 +170,6 @@ message_1(ewouldblock) -> <<"operation would block">>;
 message_1(exdev) -> <<"cross-domain link">>;
 message_1(exfull) -> <<"message tables full">>;
 message_1(nxdomain) -> <<"non-existing domain">>;
+message_1(exbadport) -> <<"inet_drv bad port state">>;
+message_1(exbadseq) -> <<"inet_drv bad request sequence">>;
 message_1(_) -> <<"unknown POSIX error">>.
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 569407f5ef..939e147ad8 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -19,7 +19,7 @@
 
 -module(ordsets).
 
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -60,6 +60,13 @@ is_set([], _) -> true.
 
 size(S) -> length(S).
 
+%% is_empty(OrdSet) -> boolean().
+%%  Return 'true' if OrdSet is an empty set, otherwise 'false'.
+-spec is_empty(Ordset) -> boolean() when
+      Ordset :: ordset(_).
+
+is_empty(S) -> S=:=[].
+
 %% to_list(OrdSet) -> [Elem].
 %%  Return the elements in OrdSet as a list.
 
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 122b476ddb..a17addcc42 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -604,57 +604,14 @@ obsolete_1(filename, find_src, 1) ->
 obsolete_1(filename, find_src, 2) ->
     {deprecated, "deprecated; use filelib:find_source/3 instead"};
 
+obsolete_1(erlang, get_stacktrace, 0) ->
+    {deprecated, "deprecated; use the new try/catch syntax for retrieving the stack backtrace"};
+
 %% Removed in OTP 20.
 
 obsolete_1(erlang, hash, 2) ->
     {removed, {erlang, phash2, 2}, "20.0"};
 
-%% Added in OTP-21
-obsolete_1(string, len, 1) ->
-    {deprecated, "deprecated; use string:length/3 instead"};
-obsolete_1(string, concat, 2) ->
-    {deprecated, "deprecated; use [Str1,Str2] instead"};
-obsolete_1(string, str, 2) ->
-    {deprecated, "deprecated; use string:find/2 instead"};
-obsolete_1(string, rstr, 2) ->
-    {deprecated, "deprecated; use string:find/3 instead"};
-obsolete_1(string, chr, 2) ->
-    {deprecated, "deprecated; use string:find/2 instead"};
-obsolete_1(string, rchr, 2) ->
-    {deprecated, "deprecated; use string:find/3 instead"};
-obsolete_1(string, span, 2) ->
-    {deprecated, "deprecated; use string:take/2 instead"};
-obsolete_1(string, cspan, 2) ->
-    {deprecated, "deprecated; use string:take/3 instead"};
-obsolete_1(string, substr, _) ->
-    {deprecated, "deprecated; use string:slice/3 instead"};
-obsolete_1(string, tokens, 2) ->
-    {deprecated, "deprecated; use string:lexemes/2 instead"};
-obsolete_1(string, chars, _) ->
-    {deprecated, "deprecated; use lists:duplicate/2 instead"};
-obsolete_1(string, copies, _) ->
-    {deprecated, "deprecated; use lists:duplicate/2 instead"};
-obsolete_1(string, words, _) ->
-    {deprecated, "deprecated; use string:lexemes/2 instead"};
-obsolete_1(string, strip, _) ->
-    {deprecated, "deprecated; use string:trim/3 instead"};
-obsolete_1(string, sub_word, _) ->
-    {deprecated, "deprecated; use string:nth_lexeme/3 instead"};
-obsolete_1(string, sub_string, _) ->
-    {deprecated, "deprecated; use string:slice/3 instead"};
-obsolete_1(string, left, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, right, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, centre, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, join, _) ->
-    {deprecated, "deprecated; use lists:join/2 instead"};
-obsolete_1(string, to_upper, _) ->
-    {deprecated, "deprecated; use string:uppercase/1 or string:titlecase/1 instead"};
-obsolete_1(string, to_lower, _) ->
-    {deprecated, "deprecated; use string:lowercase/1 or string:casefold/1 instead"};
-
 %% not obsolete
 
 obsolete_1(_, _, _) ->
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index c65a13b22e..ac0fc80526 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -37,7 +37,7 @@
 -module(sets).
 
 %% Standard interface.
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -96,6 +96,12 @@ is_set(_) -> false.
       Set :: set().
 size(S) -> S#set.size. 
 
+%% is_empty(Set) -> boolean().
+%%  Return 'true' if Set is an empty set, otherwise 'false'.
+-spec is_empty(Set) -> boolean() when
+      Set :: set().
+is_empty(S) -> S#set.size=:=0.
+
 %% to_list(Set) -> [Elem].
 %%  Return the elements in Set as a list.
 -spec to_list(Set) -> List when
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 4e89819e41..0736374f21 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -88,16 +88,6 @@
 %%% May be removed
 -export([list_to_float/1, list_to_integer/1]).
 
--deprecated([{len,1},{concat,2},
-             {str,2},{chr,2},{rchr,2},{rstr,2},
-             {span,2},{cspan,2},{substr,'_'},{tokens,2},
-             {chars,'_'},
-             {copies,2},{words,'_'},{strip,'_'},
-             {sub_word,'_'},{left,'_'},{right,'_'},
-             {sub_string,'_'},{centre,'_'},{join,2},
-             {to_upper,1}, {to_lower,1}
-            ]).
-
 %% Uses bifs: string:list_to_float/1 and string:list_to_integer/1
 -spec list_to_float(String) -> {Float, Rest} | {'error', Reason} when
       String :: string(),
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 8490770f3d..ae2e3d0e2b 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -95,7 +95,8 @@ MODULES= \
 	random_unicode_list \
 	random_iolist \
 	error_logger_forwarder \
-	maps_SUITE
+	maps_SUITE \
+	zzz_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index e40f5e9a5d..f9ab83a120 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -66,7 +66,7 @@
          otp_11851/1,otp_11879/1,otp_13230/1,
          record_errors/1, otp_11879_cont/1,
          non_latin1_module/1, otp_14323/1,
-         get_stacktrace/1, stacktrace_syntax/1,
+         stacktrace_syntax/1,
          otp_14285/1, otp_14378/1]).
 
 suite() ->
@@ -88,7 +88,7 @@ all() ->
      maps, maps_type, maps_parallel_match,
      otp_11851, otp_11879, otp_13230,
      record_errors, otp_11879_cont, non_latin1_module, otp_14323,
-     get_stacktrace, stacktrace_syntax, otp_14285, otp_14378].
+     stacktrace_syntax, otp_14285, otp_14378].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -4055,82 +4055,6 @@ otp_14323(Config) ->
     [] = run(Config, Ts),
     ok.
 
-get_stacktrace(Config) ->
-    Ts = [{old_catch,
-           <<"t1() ->
-                  catch error(foo),
-                  erlang:get_stacktrace().
-           ">>,
-           [],
-           {warnings,[{3,erl_lint,{get_stacktrace,after_old_catch}}]}},
-          {nowarn_get_stacktrace,
-           <<"t1() ->
-                  catch error(foo),
-                  erlang:get_stacktrace().
-           ">>,
-           [nowarn_get_stacktrace],
-           []},
-          {try_catch,
-           <<"t1(X) ->
-                  try abs(X) of
-                    _ ->
-                      erlang:get_stacktrace()
-                  catch
-                      _:_ -> ok
-                  end.
-
-              t2() ->
-                  try error(foo)
-                  catch _:_ -> ok
-                  end,
-                  erlang:get_stacktrace().
-
-              t3() ->
-                  try error(foo)
-                  catch _:_ ->
-                    try error(bar)
-                    catch _:_ ->
-                      ok
-                    end,
-                    erlang:get_stacktrace()
-                  end.
-
-              no_warning(X) ->
-                  try
-                     abs(X)
-                  catch
-                     _:_ ->
-                       erlang:get_stacktrace()
-                  end.
-           ">>,
-           [],
-           {warnings,[{4,erl_lint,{get_stacktrace,wrong_part_of_try}},
-                      {13,erl_lint,{get_stacktrace,after_try}},
-                      {22,erl_lint,{get_stacktrace,after_try}}]}},
-          {multiple_catch_clauses,
-           <<"maybe_error(Arg) ->
-                try 5 / Arg
-                catch
-                    error:badarith ->
-                        _Stacktrace = erlang:get_stacktrace(),
-                        try io:nl()
-                        catch
-                            error:_ -> io:format('internal error')
-                        end;
-                    error:badarg ->
-                        _Stacktrace = erlang:get_stacktrace(),
-                        try io:format(qwe)
-                        catch
-                            error:_ -> io:format('internal error')
-                        end
-                end.
-             ">>,
-           [],
-           []}],
-
-    run(Config, Ts),
-    ok.
-
 stacktrace_syntax(Config) ->
     Ts = [{guard,
            <<"t1() ->
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index ec4a16b510..02211fa8df 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -55,6 +55,7 @@
 -export([t_repair_continuation/1]).
 -export([t_match_spec_run/1]).
 -export([t_bucket_disappears/1]).
+-export([t_named_select/1]).
 -export([otp_5340/1]).
 -export([otp_6338/1]).
 -export([otp_6842_select_1000/1]).
@@ -124,6 +125,7 @@ all() ->
      t_init_table, t_whitebox, t_delete_all_objects,
      t_insert_list, t_test_ms, t_select_delete, t_select_replace,
      t_ets_dets, memory, t_select_reverse, t_bucket_disappears,
+     t_named_select,
      select_fail, t_insert_new, t_repair_continuation,
      otp_5340, otp_6338, otp_6842_select_1000, otp_7665,
      otp_8732, meta_wb, grow_shrink, grow_pseudo_deleted,
@@ -205,6 +207,38 @@ t_bucket_disappears_do(Opts) ->
     true = ets:delete(abcd),
     verify_etsmem(EtsMem).
 
+%% OTP-21: Test that select/1 fails if named table was deleted and recreated
+%%         and succeeds if table was renamed.
+t_named_select(_Config) ->
+    repeat_for_opts(fun t_named_select_do/1).
+
+t_named_select_do(Opts) ->
+    EtsMem = etsmem(),
+    T = t_name_tid_select,
+    ets_new(T, [named_table | Opts]),
+    ets:insert(T, {1,11}),
+    ets:insert(T, {2,22}),
+    ets:insert(T, {3,33}),
+    MS = [{{'$1', 22}, [], ['$1']}],
+    {[2], Cont1} = ets:select(T, MS, 1),
+    ets:delete(T),
+    {'EXIT',{badarg,_}} = (catch ets:select(Cont1)),
+    ets_new(T, [named_table | Opts]),
+    {'EXIT',{badarg,_}} = (catch ets:select(Cont1)),
+
+    true = ets:insert_new(T, {1,22}),
+    true = ets:insert_new(T, {2,22}),
+    true = ets:insert_new(T, {4,22}),
+    {[A,B], Cont2} = ets:select(T, MS, 2),
+    ets:rename(T, abcd),
+    {[C], '$end_of_table'} = ets:select(Cont2),
+    7 = A + B + C,
+
+    true = ets:delete(abcd),
+    verify_etsmem(EtsMem).
+
+
+
 
 %% Check ets:match_spec_run/2.
 t_match_spec_run(Config) when is_list(Config) ->
@@ -700,7 +734,7 @@ whitebox_2(Opts) ->
     ets:delete(T2),
     ok.
 
-select_bound_chunk(Config) ->
+select_bound_chunk(_Config) ->
     repeat_for_opts(fun select_bound_chunk_do/1, [all_types]).
 
 select_bound_chunk_do(Opts) ->
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index bec38000b2..7066d07e19 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -28,7 +28,7 @@
 	 init_per_testcase/2,end_per_testcase/2,
 	 create/1,add_element/1,del_element/1,
 	 subtract/1,intersection/1,union/1,is_subset/1,
-	 is_set/1,fold/1,filter/1,
+	 is_set/1,is_empty/1,fold/1,filter/1,
 	 take_smallest/1,take_largest/1, iterate/1]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -48,7 +48,7 @@ suite() ->
 all() -> 
     [create, add_element, del_element, subtract,
      intersection, union, is_subset, is_set, fold, filter,
-     take_smallest, take_largest, iterate].
+     take_smallest, take_largest, iterate, is_empty].
 
 groups() -> 
     [].
@@ -345,6 +345,17 @@ is_set_1(M) ->
     false = M(is_set, {}),
     M(empty, []).
 
+is_empty(Config) when is_list(Config) ->
+    test_all(fun is_empty_1/1).
+
+is_empty_1(M) ->
+    S = M(from_list, [blurf]),
+    Empty = M(empty, []),
+
+    true = M(is_empty, Empty),
+    false = M(is_empty, S),
+    M(empty, []).
+
 fold(Config) when is_list(Config) ->
     test_all([{0,71},{125,129},{254,259},{510,513},{1023,1025},{9999,10001}],
 	     fun fold_1/2).
diff --git a/lib/stdlib/test/sets_test_lib.erl b/lib/stdlib/test/sets_test_lib.erl
index 9f153822a2..93d027704b 100644
--- a/lib/stdlib/test/sets_test_lib.erl
+++ b/lib/stdlib/test/sets_test_lib.erl
@@ -32,7 +32,7 @@ new(Mod, Eq) ->
 	(from_list, L) -> Mod:from_list(L);
 	(intersection, {S1,S2}) -> intersection(Mod, Eq, S1, S2);
 	(intersection, Ss) -> intersection(Mod, Eq, Ss);
-	(is_empty, S) -> is_empty(Mod, S);
+	(is_empty, S) -> Mod:is_empty(S);
 	(is_set, S) -> Mod:is_set(S);
 	(is_subset, {S,Set}) -> is_subset(Mod, Eq, S, Set);
         (iterator, S) -> Mod:iterator(S);
@@ -56,7 +56,7 @@ singleton(Mod, E) ->
 add_element(Mod, El, S0) ->
     S = Mod:add_element(El, S0),
     true = Mod:is_element(El, S),
-    false = is_empty(Mod, S),
+    false = Mod:is_empty(S),
     true = Mod:is_set(S),
     S.
 
@@ -66,17 +66,10 @@ del_element(Mod, El, S0) ->
     true = Mod:is_set(S),
     S.
 
-is_empty(Mod, S) ->
-    true = Mod:is_set(S),
-    case erlang:function_exported(Mod, is_empty, 1) of
-	true -> Mod:is_empty(S);
-	false -> Mod:size(S) == 0
-    end.
-
 intersection(Mod, Equal, S1, S2) ->
     S = Mod:intersection(S1, S2),
     true = Equal(S, Mod:intersection(S2, S1)),
-    Disjoint = is_empty(Mod, S),
+    Disjoint = Mod:is_empty(S),
     Disjoint = Mod:is_disjoint(S1, S2),
     Disjoint = Mod:is_disjoint(S2, S1),
     S.
diff --git a/lib/stdlib/test/zzz_SUITE.erl b/lib/stdlib/test/zzz_SUITE.erl
new file mode 100644
index 0000000000..59c7fd7404
--- /dev/null
+++ b/lib/stdlib/test/zzz_SUITE.erl
@@ -0,0 +1,37 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. 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%
+%%
+-module(zzz_SUITE).
+
+%% The sole purpose of this test suite is for things we want to run last
+%% before the VM terminates.
+
+-export([all/0]).
+
+-export([lc_graph/1]).
+
+
+all() ->
+    [lc_graph].
+
+lc_graph(_Config) ->
+    %% Create "lc_graph" file in current working dir
+    %% if lock checker is enabled.
+    erts_debug:lc_graph(),
+    ok.