26510-CR0030r4 [S4-251497] carried across from Rel-18 into Rel-19 in the same meeting cycle (SA#109). (cherry picked from commit 27ecdbe9)
