Tbalden merge on 17-03-2013