merged Settings changes from Vijay

merged Settings changes from Vijay