Merge "Simplified 'External' lock reason Mapping"