Merge "Add new secure stop methods"