cherry picks form #949 #1493

Closed dirkmueller closed 1 month ago