Co-authored-by: Brian Goetz <brian.goetz@oracle.com> Co-authored-by: Peter Levart <peter.levart@gmail.com> Reviewed-by: mduigou