Merge branch 'develop' into release/MAPL-v3

# Conflicts:
#	generic/MAPL_Generic.F90

CHANGELOG.md

@@ -84,6 +84,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 ### Fixed
+Fixed nesting of internal timers (issue #3412)
 
 ### Removed
 

generic/MAPL_Generic.F90

@@ -1901,9 +1901,9 @@ recursive subroutine MAPL_GenericWrapper ( GC, import, EXPORT, CLOCK, RC)
             call state%t_profiler%stop(trim(sbrtn),_RC)
             call state%t_profiler%stop(_RC)
          end if
-         call t_p%stop(trim(state%compname),_RC)
-         call m_p%stop(trim(state%compname),_RC)
       endif
+      call t_p%stop(trim(state%compname),_RC)
+      call m_p%stop(trim(state%compname),_RC)
 
 
       _RETURN(ESMF_SUCCESS)
@@ -2447,9 +2447,6 @@ recursive subroutine MAPL_GenericFinalize ( GC, import, EXPORT, CLOCK, RC )
          call report_generic_profile()
       end if
 
-      call t_p%stop(trim(state%compname),_RC)
-      call m_p%stop(trim(state%compname),_RC)
-
       ! Clean-up
       !---------
       !ALT
@@ -6103,7 +6100,7 @@ subroutine MAPL_ESMFStateReadFromFile(STATE,CLOCK,FILENAME,MPL,HDR,RC)
 
       nwrgt1 = (mpl%grid%num_readers > 1)
 
-      isNC4 = MAPL_FILETYPE_UNK 
+      isNC4 = MAPL_FILETYPE_UNK
       if (on_tiles) mpl%grid%split_restart = .false.
       if(INDEX(FNAME,'*') == 0) then
          if (AmIRoot) then