[1.7.x] Added forgotten files from commit 28efafa24c83

Backport of c5d8e4a0d1 from master.