Merge "Add source-rest mapping"