Merge branch 'release/4.2.0' into develop

diff --cc client/src/sass/include/_bootstrap-variables.scss
index 796850174472e2e321bb645c48a5449f1773bf04,41a1448c40324c4bc75fe8e8381609e2ace75e52..7885e067cf94e799c608cc21870f0a60f959fdce
--- 1/client/src/sass/include/_bootstrap-variables.scss
--- 2/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@@ -40,11 -40,3 +40,12 @@@ $input-focus-border-color: #ced4da
  
  $nav-pills-link-active-bg: #F0F0F0;
  $nav-pills-link-active-color: #000;
++$nav-link-transition: none;
 +
 +$dropdown-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
 +$dropdown-border-radius: 3px;
 +$dropdown-link-active-color: pvar(--mainForegroundColor);
 +$dropdown-link-active-bg: pvar(--mainBackgroundHoverColor);
 +
 +$accordion-button-active-bg: pvar(--mainColorVeryLight);
 +$accordion-button-active-color: pvar(--mainForegroundColor);