diff --git a/.github/ISSUE_TEMPLATE/Bug Report.yaml b/.github/ISSUE_TEMPLATE/Bug Report.yaml
new file mode 100644
index 0000000000..afc4774f3b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug Report.yaml	
@@ -0,0 +1,142 @@
+name: "Bug Report"
+description: "Report a bug related to the OCCT"
+labels: ["2. Bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Please provide the following information:**
+  - type: dropdown
+    attributes:
+      label: Category
+      description: "Select the bug category"
+      options:
+        - Application Framework
+        - Build
+        - Coding
+        - Configuration
+        - Data Exchange
+        - Documentation
+        - DRAW
+        - Foundation Classes
+        - Mesh
+        - Modeling
+        - Samples
+        - Shape Healing
+        - Testing
+        - Visualization
+    validations:
+      required: true
+  - type: dropdown
+    id: severity
+    attributes:
+      label: Severity
+      description: "Select the bug severity"
+      options:
+        - Crash
+        - Critical
+        - Major
+        - Minor
+        - Trivial
+      default: 2
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: "A detailed description of the bug"
+    validations:
+      required: true
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected Behavior
+      description: "What you expected to happen"
+    validations:
+      required: true
+  - type: textarea
+    id: actual_behavior
+    attributes:
+      label: Actual Behavior
+      description: "What actually happened"
+    validations:
+      required: true
+  - type: textarea
+    id: sample_code
+    attributes:
+      label: Sample Code or DRAW Tcl Script
+      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      description: "Select the operating system"
+      options:
+        - Linux
+        - Windows
+        - macOS
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: compiler
+    attributes:
+      label: Compiler
+      description: "Select the compiler"
+      options:
+        - GCC
+        - Clang
+        - MSVC
+      default: 0
+    validations:
+      required: true
+  - type: input
+    id: compiler_version
+    attributes:
+      label: Compiler Version
+      description: "Specify the compiler version (optional)"
+  - type: dropdown
+    id: bitness
+    attributes:
+      label: Bitness
+      description: "Select the bitness"
+      options:
+        - 32-bit
+        - 64-bit
+      default: 1
+    validations:
+      required: true
+  - type: dropdown
+    id: occt_version
+    attributes:
+      label: OCCT Version
+      description: "Select the OCCT version where the issue was detected"
+      options:
+        - 7.4
+        - 7.5
+        - 7.6
+        - 7.7
+        - 7.8
+        - 7.9
+        - latest
+      default: 6
+    validations:
+      required: true
+  - type: input
+    id: precise_occt_version
+    attributes:
+      label: Precise OCCT Version or Branch
+      description: "Specify the precise OCCT version, branch, or SSH (optional)"
+  - type: input
+    id: environment
+    attributes:
+      label: Environment
+      description: "Details about your environment (OS, compiler, etc.)"
+  - type: textarea
+    id: additional_files
+    attributes:
+      label: Additional Files
+      description: "Attach any additional files that may help in reproducing the issue"
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature Request.yaml b/.github/ISSUE_TEMPLATE/Feature Request.yaml
new file mode 100644
index 0000000000..c2e3d9e5c3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature Request.yaml	
@@ -0,0 +1,55 @@
+name: "Feature Request"
+description: "Request a new feature or enhancement for the OCCT"
+labels: ["2. Enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Please provide the following information:**
+  - type: dropdown
+    attributes:
+      label: Category
+      description: "Select the bug category"
+      options:
+        - Application Framework
+        - Build
+        - Coding
+        - Configuration
+        - Data Exchange
+        - Documentation
+        - DRAW
+        - Foundation Classes
+        - Mesh
+        - Modeling
+        - Samples
+        - Shape Healing
+        - Testing
+        - Visualization
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: "A detailed description of the feature request"
+    validations:
+      required: true
+  - type: textarea
+    id: use_case
+    attributes:
+      label: Use Case
+      description: "Describe the use case for the feature"
+    validations:
+      required: true
+  - type: textarea
+    id: benefits
+    attributes:
+      label: Benefits
+      description: "Explain the benefits of the feature"
+    validations:
+      required: true
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional Context
+      description: "Any additional context or information"
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..82a0e0aff5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Collaborative development portal
+    url: https://dev.opencascade.org/forums
+    about: You can also use the collaborative development portal to ask questions and discuss the problem you are seeing
+  - name: GitHub discussions
+    url: https://github.com/Open-Cascade-SAS/OCCT/discussions
+    about: You can also use GitHub discussions to ask questions and discuss the problem you are seeing
+  - name: Mantis bug tracker
+    url: https://tracker.dev.opencascade.org/
+    about: You can also use the Mantis bug tracker to report bugs and issues
+  - name: Contact US form
+    url: https://dev.opencascade.org/webform/contact_us
+    about: You can also use the Contact US form to ask questions and discuss the problem you are seeing
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index a99c773769..329fe38d10 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -8,11 +8,14 @@ on:
   push:
     branches:
       - 'master'
+  pull_request:
+    branches:
+      - '**'
 
 jobs:
   build:
     name: Build Refman Documentation
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     steps:
     # Step: Checkout the repository
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8507b7fb15..c1705f9441 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1036,9 +1036,10 @@ endif()
 # validating custom.bat/sh for changes
 if (EXISTS "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" AND EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
   file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
-  if (NOT "${CUSTOM_CONTENT}" MATCHES "${ADDITIONAL_CUSTOM_CONTENT}")
+  string(FIND "${CUSTOM_CONTENT}" "${ADDITIONAL_CUSTOM_CONTENT}" pos)
+  if (pos EQUAL -1)
     set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-    OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+    OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
   endif()
 else()
   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")