Import numberous component changes to the lite branch
Compatibility fix