Merge "Resource-mapping.component - removed unwanted code"