Further modifications related to removing controls from Master 8.0 branch