Backport the changes for bug#14786792 which is regression 
	of fix for bug#11761854.So backported both changes.