Merging debug branch changes back into master branch