Merge current ten24 develop into Mandelkind develop