Merge "BUG-2383: implement EffectiveRibInWriter"