Pull back Sam's develop' branch changes.