Merge of changes from the Hackton