Resolve issue MB-10696 for tutorial