diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343c7b48e..64f27a16d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ OPTIONAL:
 - masking api
 - preprocess api
 
-## Update for 2023-01-24
+## Update for 2023-01-25
 
 Another big release, highlights being:  
 - A lot more functionality in the **Control** module:
@@ -229,6 +229,7 @@ As of this release, default backend is set to **diffusers** as its more feature
   - sdxl: fix positive prompt embeds
   - img2img: clip and blip interrogate  
   - img2img: sampler selection offset  
+  - img2img: support variable aspect ratio without explicit resize  
   - api: return current image in progress api if requested  
   - api: sanitize response object  
   - api: cleanup error logging  
@@ -241,6 +242,7 @@ As of this release, default backend is set to **diffusers** as its more feature
   - processing: fix batch file names  
   - live preview: fix when using `bfloat16`
   - upscale: fix ldsr
+  - model merge: unbalanced models where not all keys are present, thanks @AI-Casanova
   - better sdxl model detection
   - cli: fix cmd args parsing  
   - global crlf->lf switch  
diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index 918da1b68..6a1d882e8 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit 918da1b68f3f59256885996d211b89cd34e87cb3
+Subproject commit 6a1d882e891c4b2e7986b9fda825fdbf24f7867e
diff --git a/modules/k-diffusion b/modules/k-diffusion
index 8ace775a8..6ab5146d4 160000
--- a/modules/k-diffusion
+++ b/modules/k-diffusion
@@ -1 +1 @@
-Subproject commit 8ace775a8409f074fbfdd852f57b6de6f6440191
+Subproject commit 6ab5146d4a5ef63901326489f31f1d8e7dd36b48
diff --git a/modules/processing.py b/modules/processing.py
index 6a15e85cd..f32a0dd27 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1346,7 +1346,7 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):
             if shared.opts.save_init_img:
                 images.save_image(img, path=shared.opts.outdir_init_images, basename=None, forced_filename=self.init_img_hash, suffix="-init-image")
             image = images.flatten(img, shared.opts.img2img_background_color)
-            if self.width is None or self.height is None:
+            if self.width is None or self.height is None or self.resize_mode == 0:
                 self.width, self.height = image.width, image.height
             if crop_region is None and self.resize_mode != 4 and self.resize_mode > 0:
                 if image.width != self.width or image.height != self.height:
diff --git a/modules/shared.py b/modules/shared.py
index 88b17d1e1..0141a52da 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -185,7 +185,6 @@ def writefile(data, filename, mode='w', silent=False, atomic=False):
         if locked and os.path.exists(f"{filename}.lock"):
             os.remove(f"{filename}.lock")
     except Exception:
-        print('HERE4')
         locking_available = False
 
 
diff --git a/modules/ui_sections.py b/modules/ui_sections.py
index 48a1b7cb4..f6456df14 100644
--- a/modules/ui_sections.py
+++ b/modules/ui_sections.py
@@ -11,7 +11,7 @@ def create_toprow(is_img2img: bool = False, id_part: str = None):
 
 
     def parse_style(styles):
-        return styles.split('|')
+        return styles.split('|') if styles is not None else None
 
     if id_part is None:
         id_part = "img2img" if is_img2img else "txt2img"
diff --git a/scripts/ipadapter.py b/scripts/ipadapter.py
index 61bd312ae..f978501bf 100644
--- a/scripts/ipadapter.py
+++ b/scripts/ipadapter.py
@@ -152,4 +152,6 @@ class Script(scripts.Script):
         return [adapter, scale, image]
 
     def process(self, p: processing.StableDiffusionProcessing, adapter_name, scale, image): # pylint: disable=arguments-differ
+        if shared.backend != shared.Backend.DIFFUSERS:
+            return
         apply(shared.sd_model, p, adapter_name, scale, image)
diff --git a/scripts/photomaker.py b/scripts/photomaker.py
index e8433214d..c6e9c9b5e 100644
--- a/scripts/photomaker.py
+++ b/scripts/photomaker.py
@@ -3,7 +3,6 @@ import gradio as gr
 import huggingface_hub as hf
 from PIL import Image
 from modules import shared, processing, sd_models, scripts
-from scripts.photomaker_model import PhotoMakerStableDiffusionXLPipeline # pylint: disable=no-name-in-module
 
 
 class Script(scripts.Script):
@@ -49,6 +48,8 @@ class Script(scripts.Script):
 
     # Run pipeline
     def run(self, p: processing.StableDiffusionProcessing, trigger, strength, start, images): # pylint: disable=arguments-differ
+        from scripts.photomaker_model import PhotoMakerStableDiffusionXLPipeline # pylint: disable=no-name-in-module
+
         # prepare pipeline
         input_images = self.load_images(images)
         if len(input_images) == 0:
diff --git a/wiki b/wiki
index a784dd440..d54a64b47 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit a784dd440d310bfdf179a057bd80eb6c4193f82f
+Subproject commit d54a64b47bb3f2abfebea9779ce694e6cf0c219d