MQA-978: Disposable feature can cause unnecessary object creation