Updates merge issue fix into master