Merge 752ccbad0faa3b653a6bf25b51d21594881556fc into backport/docs/1-17-release-notes/friendly-smiling-sailfish