MB-7629: work in progress, not for merge