--- title: Separate key and other entities into own class files merge_request: 24495 author: Rajendra Kadam type: added