Rebase on master: NgComponent -> Component