[Olena-patches] [Olena] #264: Merge try-next into next