#JC-1869: Fixed remarks with locale resolver