integrate Virindis changes