Merge remote-tracking branch 'mbeth-private/ticket40833_mr'