MEXUS-7608: Applied comments