Merge "Fix component startup"