Steffen's changes in v 1.11.11