Pr/786

Continuation of #786