merge changes from locale test branch