Re: [Olena-patches] scool r49: Merge main branch to trunk