Upstreaming changes from others#1

hafiidz wants to merge 15 commits intodevilismyfriend:maindevilismyfriend/latent-diffusion:mainfrom

hafiidz:mainhafiidz/latent-diffusion:mainCopy head branch name to clipboard