Changes to incorporate new proprietary stuff from vendor tree