Merge from master
Updates to comparison of results and inputs