Merge "Negotiate locales during Resources contruction and updates"