Fixes from merge

1 job for Issue/1938-internalHandling in 2 minutes and 2 seconds (queued for 3 seconds)
latest