Merge "WIP Add configuration specific resources"