MDL-54551 core: touch-up after review