MDL-44583 Assign: performance fixes