Merge "Bug fix + clean up on component alias"