Merge of build trunk