Add feature for request: #11165