Merging changes made for Redhawk 1.10