diff --git a/src/components/BaseLayout/Sidebar/SidebarBottom/index.tsx b/src/components/BaseLayout/Sidebar/SidebarBottom/index.tsx
index 1e77bd90..9bc39803 100644
--- a/src/components/BaseLayout/Sidebar/SidebarBottom/index.tsx
+++ b/src/components/BaseLayout/Sidebar/SidebarBottom/index.tsx
@@ -17,10 +17,11 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
     collapsed: boolean;
     toggleCollapsed?: () => void;
     onItemClick?: () => void;
+    enableLocaleSwitcher?: boolean;
 }
 
 export function SidebarBottom(props: Props) {
-    const { collapsed, toggleCollapsed, onItemClick, ...other } = props;
+    const { collapsed, toggleCollapsed, onItemClick, enableLocaleSwitcher = true, ...other } = props;
     const appToken = getToken();
     const isAnonymousUser = !appToken;
 
@@ -32,7 +33,7 @@ export function SidebarBottom(props: Props) {
             {...other}
         >
             <S.Divider $hidden={collapsed} />
-            <LocaleSwitcher onItemClick={onItemClick} />
+            {enableLocaleSwitcher && <LocaleSwitcher onItemClick={onItemClick} />}
             {!isAnonymousUser ? (
                 <>
                     <S.Divider $hidden={collapsed} />
diff --git a/src/components/QuestionnaireResponseForm/index.tsx b/src/components/QuestionnaireResponseForm/index.tsx
index b2f30f04..016ccb11 100644
--- a/src/components/QuestionnaireResponseForm/index.tsx
+++ b/src/components/QuestionnaireResponseForm/index.tsx
@@ -36,6 +36,7 @@ export interface QRFProps extends QuestionnaireResponseFormProps {
     FormFooterComponent?: React.ElementType<FormFooterComponentProps>;
     saveButtonTitle?: React.ReactNode;
     cancelButtonTitle?: React.ReactNode;
+    autoSave?: boolean;
 }
 
 export const saveQuestionnaireResponseDraft = async (