dev content resolver changes merge into master