Manual merge of NX-450-component-source-api