🍒 Merge changes from PR #331 to release-v1.6.1

[ocrvs-bot]

Automated PR to merge changes from develop to release-v1.6.1

I failed to cherry-pick the changes automatically because of the following:

usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
                     [-S[<keyid>]] <commit>...
 or: git cherry-pick (--continue | --skip | --abort | --quit)

  --quit                end revert or cherry-pick sequence
  --continue            resume revert or cherry-pick sequence
  --abort               cancel revert or cherry-pick sequence
  --skip                skip current commit and continue
  --[no-]cleanup <mode> how to strip spaces and #comments from message
  -n, --no-commit       don't automatically commit
  --commit              opposite of --no-commit
  -e, --[no-]edit       edit the commit message
  -s, --[no-]signoff    add a Signed-off-by trailer
  -m, --[no-]mainline <parent-number>
                        select mainline parent
  --[no-]rerere-autoupdate
                        update the index with reused conflict resolution if possible
  --[no-]strategy <strategy>
                        merge strategy
  -X, --[no-]strategy-option <option>
                        option for merge strategy
  -S, --[no-]gpg-sign[=<key-id>]
                        GPG sign commit
  -x                    append commit name
  --[no-]ff             allow fast-forward
  --[no-]allow-empty    preserve initially empty commits
  --[no-]allow-empty-message
                        allow commits with empty messages
  --[no-]keep-redundant-commits
                        deprecated: use --empty=keep instead
  --empty (stop|drop|keep)
                        how to handle commits that become empty

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.1-331-23885:auto-pr-release-v1.6.1-331-23885
git fetch origin image-cleanup:image-cleanup

git checkout auto-pr-release-v1.6.1-331-23885
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 

[Zangetsu101]

Closing as it's already been cherry-picked