Merging v1.0 branch bug fixes to develop branch. No Conflicts observed.