Resolve issue MB-12800 for tutorial