Changes from onsite integration before plenary
Resolved merge conflicts.