MDL-39376: Optimization applied