Fix problem caused by sensitive calibration fiber
Merge pull request #3957 from fratnikov/shashlyk-bug-fix-3

Shashlyk bug fix 3