MANATEE-188: Manatee 2.0 merge