MAN-1244

Owned by cathartius@TH