2.11.4

rework of #242 (squashed original state, one follow-up commit)