Re: [Olena-patches] [Olena] #264: Merge unstable/scribo into next