Changes are made to resolve upgradev3.2 queries