Re #957 preraring a locale switch scenario...