The button "Cancel" must be after "Next"  to respect UI spec.
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking