block locale fix
Merge branch 'feature/blocks-86' into staging