* Bringing over fix for PR 16301 from sky beta branch.