array entry token accepts token instead of value
Merge branch 'array_entry_token' into develop