Merged Venisas changes