Addition to SD2 commit [2988]