Merge remote-tracking branch 'origin/main' into SDK15-create-dockerfile-image-with-sdk