Merge "Add support for the new unwind method."