Merge "GuidedStep: More example of editing" into mnc-ub-dev