Make the library compatible with the last changes in the core.
(cherry picked from commit eb75402)
Fixed array syntax after cherry pick merge