[Olena-patches] olena: olena-2.0-609-g9375af1 Do not move classes/functions in their related sections.