Merging Ux and Raven integration changes to master copy