merge Hope's changes to source branch