Some of this is in core, and some of it is in the component. These two PRs should fix the issue when merged