GIR-12122

GIR-12122