Merge of Matt's branch, COMMONS-124, COMMONS-125, COMMONS-126,
COMMONS-127, COMMONS-128