[NUCCORE-159] Add placeholder for savepoints