Fix merge conflict 3 (+3 squashed commits)
Squashed commits:
[05fd062] Fix merge conflict 2
[26fe0be] Fix merge conflict
[164cf6e] Move array_* helpers function to Arr class