Adding changes from Markus.wiki.git