Merge "Refactor mechanism driver metadata"