(MODULES-1195) Rebase of #202

Closes #202