- Done: PR `#6690` opened, mergeable