SPARK-3732# Fix for SPARK-3732

Code fix and documentation change for proposed fix for SPARK-3732