Merge "Add resource resolution component DSL"