Issue #RAZ-1829 : http://issues.razuna.com/browse/RAZ-1829
Issue #RAZ-1782 : http://issues.razuna.com/browse/RAZ-1782