fb603e81f0
This needs SPARK-33739 in the matching spark branch in order to work Contributed by Steve Loughran. Change-Id: I4fe75b057159e35aacc072da3cb7343467c0c3f1