Merge of goldeneye branch