Issue #RAZ-1829 & #RAZ-1782

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