Co-authored-by: Tobias Holenstein <tholenstein@openjdk.org> Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org> Reviewed-by: dlong, epeter