fixes to clean up after the merge of generic branch merge