Co-authored-by: Alan Bateman <alanb@openjdk.org> Co-authored-by: Viktor Klang <vklang@openjdk.org> Reviewed-by: vklang