Restored some lost software part (maybe due to a conflict resolution)