added MP upgrade changes to Fix-1f branch