Apply basic patch

Initial show up of multi db patch