Merge current ten24 master into Mandelkind master