Merging missing commits from May28-Jul3