Merge new softwarecore