Mondrain 2229

Hi, @lucboudreau! 
Could you review new changes? 
The mondrian part is here:
https://github.com/YuryBY/mondrian/compare/MONDRIAN-2229
Thanks, Yury.