Merge of changes done on vivace1 during testing.