Release fix Nadim changes