Merge changes from Shivammg Pull-2