MDL-37308 files: Additional fixes for transparency