DDBNEXT-1452
Using class fr
Merge branch 'DDBNEXT-1452-IMR' into develop