Improved locale listener fallback to default
Merge branch 'refs/heads/release'