STS-916, #4 : backport fix from master