Merge "Fix bug 1005397"