Resolving last few merge conflicts from merge with emprice-testing branch