MDL-59369 user: IR fixes