Should fix #13836 but I wasn't able to reproduce the issue locally so not 100% sure.
Didn't try to reproduce but looks good. Looked through the code making sure that the
core option gets only updated after components have been updated. In this case the code should work. Hard to know when we cannot reproduce it.