WP-4736 move few sections