SKIPME backport SPARK-1689