Merge Tobias and Kostas changes