backport #7 from master - STS-803