Hot fix to resolve the compilation error caused by SPARK-821.