Initial merge of catkin and non-catkin branches, prepping for blending
Finishing migration of updated upstream