Merge of the feature branch into the topic branch