Re: [Olena-patches] Revision 3996