Merge pull request #2958 from chrischdi/pr-drop-v1-6

Merge pull request #2958 from chrischdi/pr-drop-v1-6 #1428