Merge branch 'master' into m3hm3t/fix1 #7601

Job	Run time
build_and_publish_images (nightly)	39s
build_and_publish_images (alpine)	41s
build_and_publish_images (postgres_16)	44s
build_and_publish_images (latest)	45s
build_and_publish_images (postgres_15)	50s
	3m 39s

Provide feedback