New release from 1.1 branch as i can't merge into the 8.x-1.x branch
Beta version fixing some issues on new (temporary) development branch. Will be merged later.