corrections for erroneous merge of [4b432961ac|retro-sbsdiff] (see ticket [5a855f1bc6])