diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f8078267..df32d924a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,22 @@
 name: Release
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      release_type:
+        description: 'Final release or beta'
+        required: true
+        type: choice
+        options:
+        - final
+        - beta
 
 jobs:
   release:
     if: github.repository == 'moodlemobile/moodleapp'
     runs-on: ubuntu-latest
+    env:
+      RELEASE_TYPE: ${{ github.event.inputs.release_type || 'final' }}
 
     steps:
     - uses: actions/checkout@v2
@@ -20,4 +31,4 @@ jobs:
     - name: Create release tags
       env:
         GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-      run: ./.github/scripts/release.sh
+      run: ./.github/scripts/release.sh $RELEASE_TYPE
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index a9ef7ca64..07801751f 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -13,15 +13,15 @@
         [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
-    <ion-card *ngIf="phases">
+    <ion-card *ngIf="phases && workshop">
         <ion-item button (click)="viewPhaseInfo()" detail="true">
             <ion-label>
-                <h2 class="ion-text-wrap">{{ phases[workshop!.phase].title }}</h2>
+                <h2 class="ion-text-wrap">{{ phases[workshop.phase].title }}</h2>
             </ion-label>
         </ion-item>
-        <ng-container *ngIf="phases && phases[workshop!.phase] && phases[workshop!.phase].tasks &&
-            phases[workshop!.phase].tasks.length">
-            <ion-item button class="ion-text-wrap" *ngFor="let task of phases[workshop!.phase].tasks"
+        <ng-container *ngIf="phases && phases[workshop.phase] && phases[workshop.phase].tasks &&
+            phases[workshop.phase].tasks.length">
+            <ion-item button class="ion-text-wrap" *ngFor="let task of phases[workshop.phase].tasks"
                 [class.item-dimmed]="task.code == 'submit' && !showSubmit" (click)="runTask(task)" detail="false">
                 <ion-icon slot="start" name="far-circle" *ngIf="task.completed == null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
@@ -45,7 +45,7 @@
     </ion-card>
 
     <!-- Description (setup phase only) -->
-    <ion-card *ngIf="description && workshop && workshop!.phase == PHASE_SETUP">
+    <ion-card *ngIf="description && workshop && workshop.phase == PHASE_SETUP">
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <h3 class="item-heading">{{ 'core.description' | translate }}</h3>
@@ -56,14 +56,14 @@
         </ion-item>
     </ion-card>
 
-    <div *ngIf="access && workshop && workshop!.phase >= PHASE_SUBMISSION">
+    <div *ngIf="access && workshop && workshop.phase >= PHASE_SUBMISSION">
         <!-- CLOSED PHASE -->
-        <ng-container *ngIf="workshop!.phase >= PHASE_CLOSED">
-            <ion-card *ngIf="workshop!.conclusion">
+        <ng-container *ngIf="workshop.phase >= PHASE_CLOSED">
+            <ion-card *ngIf="workshop.conclusion">
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h3 class="item-heading">{{ 'addon.mod_workshop.conclusion' | translate }}</h3>
-                        <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop!.conclusion"
+                        <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop.conclusion"
                             contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
@@ -92,11 +92,11 @@
         </ng-container>
 
         <!-- SUBMISSION PHASE -->
-        <ion-card *ngIf="workshop!.phase == PHASE_SUBMISSION && workshop!.instructauthors">
+        <ion-card *ngIf="workshop.phase == PHASE_SUBMISSION && workshop.instructauthors">
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <h3 class="item-heading">{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h3>
-                    <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop!.instructauthors"
+                    <core-format-text collapsible-item [component]="component" [componentId]="module.id" [text]="workshop.instructauthors"
                         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </ion-label>
@@ -106,10 +106,10 @@
         <ion-card *ngIf="canSubmit">
             <ion-item-divider class="ion-text-wrap">
                 <ion-label>
-                    <h3 class="item-heading" *ngIf="workshop!.phase != PHASE_CLOSED || !submission">
+                    <h3 class="item-heading" *ngIf="workshop.phase != PHASE_CLOSED || !submission">
                         {{ 'addon.mod_workshop.yoursubmission' | translate }}
                     </h3>
-                    <h3 class="item-heading" *ngIf="workshop!.phase == PHASE_CLOSED && submission">
+                    <h3 class="item-heading" *ngIf="workshop.phase == PHASE_CLOSED && submission">
                         {{ 'addon.mod_workshop.yoursubmissionwithassessments' | translate }}
                     </h3>
                 </ion-label>
@@ -119,13 +119,13 @@
                     <p *ngIf="!submission">{{ 'addon.mod_workshop.noyoursubmission' | translate }}</p>
                 </ion-label>
             </ion-item>
-            <addon-mod-workshop-submission *ngIf="submission" [submission]="submission" [courseId]="workshop!.course" [module]="module"
+            <addon-mod-workshop-submission *ngIf="submission" [submission]="submission" [courseId]="workshop.course" [module]="module"
                 [workshop]="workshop" [access]="access">
             </addon-mod-workshop-submission>
         </ion-card>
 
 
-        <ng-container *ngIf="workshop!.phase >= PHASE_CLOSED">
+        <ng-container *ngIf="workshop.phase >= PHASE_CLOSED">
             <ion-card *ngIf="publishedSubmissions && publishedSubmissions.length">
                 <ion-item-divider class="ion-text-wrap">
                     <ion-label>
@@ -133,7 +133,7 @@
                     </ion-label>
                 </ion-item-divider>
                 <ng-container *ngFor="let submission of publishedSubmissions">
-                    <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop!.course" [module]="module"
+                    <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module"
                         [workshop]="workshop" [access]="access" summary="true" class="core-as-item">
                     </addon-mod-workshop-submission>
                 </ng-container>
@@ -141,14 +141,13 @@
         </ng-container>
 
         <!-- ASSESSMENT PHASE -->
-        <ng-container *ngIf="workshop!.phase >= PHASE_ASSESSMENT">
-            <ion-card *ngIf="workshop!.phase == PHASE_ASSESSMENT && workshop!.instructreviewers">
+        <ng-container *ngIf="workshop.phase >= PHASE_ASSESSMENT">
+            <ion-card *ngIf="workshop.phase == PHASE_ASSESSMENT && workshop.instructreviewers">
                 <ion-item class="ion-text-wrap">
                     <ion-label>
                         <h3 class="item-heading">{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h3>
                         <core-format-text collapsible-item [component]="component" [componentId]="module.id"
-                            [text]="workshop!.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"
-                            [courseId]="courseId">
+                            [text]="workshop.instructreviewers" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
                 </ion-item>
@@ -167,7 +166,7 @@
                 </ion-item>
                 <ng-container *ngFor="let assessment of (assessments || [])">
                     <addon-mod-workshop-submission [submission]="assessment.submission" [assessment]="assessment"
-                        [courseId]="workshop!.course" [module]="module" [workshop]="workshop" [access]="access" summary="true"
+                        [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true"
                         class="core-as-item">
                     </addon-mod-workshop-submission>
                 </ng-container>
@@ -175,13 +174,13 @@
         </ng-container>
 
         <!-- MULTIPLE PHASES SUBMISSION OR GREATER only teachers -->
-        <ion-card *ngIf="access.canviewallsubmissions && workshop!.phase >= PHASE_SUBMISSION &&
+        <ion-card *ngIf="access.canviewallsubmissions && workshop.phase >= PHASE_SUBMISSION &&
             ((grades && grades.length) || (groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)))">
             <ion-item-divider class="ion-text-wrap">
                 <ion-label>
-                    <h3 class="item-heading" *ngIf="workshop!.phase == PHASE_SUBMISSION">{{ 'addon.mod_workshop.submissionsreport' |
+                    <h3 class="item-heading" *ngIf="workshop.phase == PHASE_SUBMISSION">{{ 'addon.mod_workshop.submissionsreport' |
                         translate }}</h3>
-                    <h3 class="item-heading" *ngIf="workshop!.phase > PHASE_SUBMISSION">{{ 'addon.mod_workshop.gradesreport' | translate }}
+                    <h3 class="item-heading" *ngIf="workshop.phase > PHASE_SUBMISSION">{{ 'addon.mod_workshop.gradesreport' | translate }}
                     </h3>
                 </ion-label>
             </ion-item-divider>
@@ -189,7 +188,7 @@
             </core-group-selector>
 
             <ng-container *ngFor="let submission of grades">
-                <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop!.course" [module]="module"
+                <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module"
                     [workshop]="workshop" [access]="access" summary="true" class="core-as-item">
                 </addon-mod-workshop-submission>
             </ng-container>
@@ -197,13 +196,13 @@
             <ion-grid *ngIf="page > 0 || hasNextPage">
                 <ion-row class="ion-align-items-center">
                     <ion-col *ngIf="page > 0">
-                        <ion-button expand="block" fill="outline" (click)="gotoSubmissionsPage(page! -1)">
+                        <ion-button expand="block" fill="outline" (click)="gotoSubmissionsPage(page -1)">
                             <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
                             {{ 'core.previous' | translate }}
                         </ion-button>
                     </ion-col>
                     <ion-col *ngIf="hasNextPage">
-                        <ion-button expand="block" (click)="gotoSubmissionsPage(page! + 1)">
+                        <ion-button expand="block" (click)="gotoSubmissionsPage(page + 1)">
                             {{ 'core.next' | translate }}
                             <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
                         </ion-button>
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index c8a255e7a..382a796c0 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -291,13 +291,13 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
 
         await Promise.all(grades.map(async (grade) => {
             const submission: AddonModWorkshopSubmissionDataWithOfflineData = {
-                id: grade.submissionid,
+                id: grade.submissionid || 0,
                 workshopid: workshop.id,
                 example: false,
                 authorid: grade.userid,
-                timecreated: grade.submissionmodified,
-                timemodified: grade.submissionmodified,
-                title: grade.submissiontitle,
+                timecreated: grade.submissionmodified || 0,
+                timemodified: grade.submissionmodified || 0,
+                title: grade.submissiontitle || '',
                 content: '',
                 contenttrust: 0,
                 attachment: 0,
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 68efe5b4e..a239d2aef 100644
--- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -4,7 +4,7 @@
             <core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile?.id" slot="start">
             </core-user-avatar>
             <ion-label>
-                <h2>
+                <h2 *ngIf="submission.title">
                     <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </h2>
@@ -68,7 +68,7 @@
         <core-user-avatar [user]="profile" slot="start" [courseId]="courseId" [userId]="profile?.id">
         </core-user-avatar>
         <ion-label>
-            <h2>
+            <h2 *ngIf="submission.title">
                 <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h2>
diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts
index 582d61195..5e551e376 100644
--- a/src/addons/mod/workshop/services/workshop.ts
+++ b/src/addons/mod/workshop/services/workshop.ts
@@ -1766,9 +1766,9 @@ export type AddonModWorkshoGradesReportData = {
 
 export type AddonModWorkshopGradesData = {
     userid: number; // The id of the user being displayed in the report.
-    submissionid: number; // Submission id.
-    submissiontitle: string; // Submission title.
-    submissionmodified: number; // Timestamp submission was updated.
+    submissionid?: number; // Submission id.
+    submissiontitle?: string; // Submission title.
+    submissionmodified?: number; // Timestamp submission was updated.
     submissiongrade?: number; // Aggregated grade for the submission.
     gradinggrade?: number; // Computed grade for the assessment.
     submissiongradeover?: number; // Grade for the assessment overrided by the teacher.
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index d8a742862..d7a2d78b0 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -26,13 +26,6 @@
             }
         }
     }
-
-    &.other {
-        img {
-            filter: var(--filter);
-        }
-    }
-
 }
 
 img {
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index fe3131614..485c3c63e 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -12,7 +12,7 @@
 <ion-content class="limited-width">
     <core-loading [hideUntil]="loaded">
         <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterChanged($event.target)" (ionCancel)="filterChanged($event.target)"
-            [placeholder]="'core.filter' | translate">
+            [placeholder]="'core.filter' | translate" class="ion-margin-top">
         </ion-searchbar>
         <ion-list>
             <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no" detail="false">
diff --git a/src/core/features/user/pages/about/about.scss b/src/core/features/user/pages/about/about.scss
index 72c979e18..aff9ba566 100644
--- a/src/core/features/user/pages/about/about.scss
+++ b/src/core/features/user/pages/about/about.scss
@@ -1,6 +1,9 @@
 :host {
-    .core-user-profile-maininfo::part(native) {
-        flex-direction: column;
+    .core-user-profile-maininfo {
+        padding-top: 16px;
+        &::part(native) {
+            flex-direction: column;
+        }
     }
     core-user-avatar {
         --core-avatar-size: var(--core-large-avatar-size);
diff --git a/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png b/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png
index 1fb332174..72b3fce00 100644
Binary files a/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png and b/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png differ
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1d01e3107..99d13131a 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -800,7 +800,7 @@ body.core-iframe-fullscreen ion-router-outlet {
 
 .item.item-file {
     ion-thumbnail {
-        --size: 24px;
+        --size: 32px;
         width: var(--size);
         height: var(--size);
     }