diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eabdf128ecad3f207991af29cc569d9309305fcc..6d9a1dda16423e0def6d03a9a1c0dffa6bcbd710 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -253,6 +253,26 @@ mac-gm-fullsimlight:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
 
+
+mac-gm-fsl:
+  <<: *macos-job
+  <<: *geomodel-job
+  stage: step-A
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
+
+
+mac-gm-all:
+  <<: *macos-job
+  <<: *geomodel-job
+  stage: step-C
+  needs: ["mac-coin", "mac-soqt"]
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
+
+
 mac-gm-atlasextras:
   <<: *macos-job
   <<: *geomodel-job
@@ -347,6 +367,27 @@ ubu-gm-fullsimlight:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
 
+
+ubu-gm-fsl:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-B
+  needs: ["ubu-geant4"]
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
+
+
+ubu-gm-all:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-C
+  needs: ["ubu-coin", "ubu-soqt", "ubu-geant4"]
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
+
+
 ubu-gm-atlasextras:
   <<: *ubuntu-job
   <<: *geomodel-job
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34e5af4de4e5be0362ab1d2046824454d68f815e..0f5fae860f14bc27c8998673eeb6bd279b45c5ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,13 @@ option(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING "Enable FullSimLight profiling targ
 option(GEOMODEL_BUILD_FSL "Enable the build of FSL and FullSimLight" OFF)
 option(GEOMODEL_BUILD_ATLASEXTENSIONS "Build the Custom ATLAS Extensions" OFF)
 
+
+if(GEOMODEL_BUILD_FSL AND GEOMODEL_BUILD_FULLSIMLIGHT)
+  message(STATUS "==> NOTE: You enabled both BUILD_FSL and BUILD_FULLSIMLIGHT. Since BUILD_FSL triggers the build of the FullSimLight package as well, I set BUILD_FULLSIMLIGHT to FALSE to avoid errors of 'double inclusion'")
+  set(GEOMODEL_BUILD_FULLSIMLIGHT FALSE)
+endif()
+
+
 if(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING)
   set(GEOMODEL_BUILD_FULLSIMLIGHT ON CACHE BOOL "Enable the build of FullSimLight" FORCE)
   include(CTest) # needs to be included at the top level
@@ -68,7 +75,6 @@ list( APPEND BUILT_PACKAGES "GeoModelIO")
 if(GEOMODEL_BUILD_ALL)
   set(GEOMODEL_BUILD_TOOLS         TRUE)
   set(GEOMODEL_BUILD_VISUALIZATION TRUE)
-  set(GEOMODEL_BUILD_FULLSIMLIGHT  TRUE)
   set(GEOMODEL_BUILD_FSL           TRUE)
 endif()
 
diff --git a/documentation/docs/dev/troubleshooting.md b/documentation/docs/dev/troubleshooting.md
index af2b2414d9998198a1921bc070c5feff8f385a11..65218e92ad17cfcbb5cac35f78b798daf6686d30 100644
--- a/documentation/docs/dev/troubleshooting.md
+++ b/documentation/docs/dev/troubleshooting.md
@@ -10,6 +10,18 @@ If, after starting `gmex`, you get a window that tells you that was not possible
 * try to restart your machine. Seriously! :-) Sometimes, after updates to the graphical packages (those can happen behind the scene, without you to notice them), the system needs to be restarted. I experienced that personally: `gmex` was failing to start, when I was trying a new version of our 3D engine, Coin3D, and I was trying to find for the cause in the code of Coin3D itself... But then my OpenGL-accelerated terminal emulator, Alacritty, had stopped working as well; and that gave me a hint that something global was happening... So, I Googled, and I found a suggestion to resart the machine to get the graphics drivers sync between each others. Try that first, it can help! ;-)
 * your OpenGL installation / support is not correct / fully-installed. In that case, you should look for instructions to install proper OpenGL support on your system.
 
+### GMEX crashes on the latest Ubuntu
+
+The GeoModelExplorer (GMEX) application appears to crash when run on the latest version of the Ubuntu "Wayland" window manager.
+
+The problem is that the SoQt/Coin third-party packages we use in GMEX have not been ported to work to the latest Wayland yet. As far as we know, all applications that use the Coin/SoQt graphics layers as their graphics interface crash on the latest Wayland. 
+
+The Coin3D community is aware of the problem but there are no fixes, yet.
+
+Therefore, we strongly suggest to use the alternative X11 window manager when running GEMX (or all other SoQt/Coin3D-based applications) on Ubuntu, for the time being.
+
+
+
 ## Packages
 
 ### macOS / Homebrew
diff --git a/documentation/docs/start/install.md b/documentation/docs/start/install.md
index 807d27ee92f14e29bb76f706c0a4e27add718cbe..b30c47468c612a5554019b2952967d0bd67cf4e2 100644
--- a/documentation/docs/start/install.md
+++ b/documentation/docs/start/install.md
@@ -42,6 +42,13 @@ sudo apt install geomodel-visualization-dev
 
 If you have outdated packages, these commands will replace those packages with the most recent version.
 
+!!! warning 
+
+    The GeoModelExplorer (GMEX) application appears to crash when run on the latest version of the Ubuntu "Wayland" window manager. The problem is that the SoQt/Coin third-party packages we use in GMEX have not been ported to work to the latest Wayland yet. As far as we know, all applications that use the Coin/SoQt graphics layers as their graphics interface crash on the latest Wayland. The Coin3D community is aware of the problem but there are no fixes, yet.
+
+    We strongly suggest to use the alternative X11 window manager when running GEMX (or all other SoQt/Coin3D-based applications) on Ubuntu, for the time being.
+
+
 ## macOS
 
 On macOS, we use the [Homebrew package manager](http://brew.sh) to handle and install the GeoModel packages. If you don't have Homebrew installed on your machine, you should first install it by following the instructions on the Homebrew website: <http://brew.sh>.  Please be attentive to any instructions printed after the installation procedure; there might be environment variables to set.