Merge "Fixing getModelState event processing"