data-binding: ensured initialState field is set correctly (will be removed in Errai 3)
Merge branch '2.4'