apply SPARK-4148 to branch-1.1