Merge with Markus's latest changes