Bug-fixing related to 1.2.x

Only those PRs that should be included into patch releases should be included in this milestone.