MDL-16982 Administration: Integrated Inaki's suggestions