Fold issue 2463 into general "pay for play reflection" bucket (#2472)
Fold issue 2463 into general "pay for play reflection" bucket (#2472)


botaberg/corert,tijoytom/corert,yizhang82/corert,botaberg/corert,sandreenko/corert,shrah/corert,yizhang82/corert,krytarowski/corert,yizhang82/corert,krytarowski/corert,shrah/corert,yizhang82/corert,sandreenko/corert,botaberg/corert,tijoytom/corert,gregkalapos/corert,gregkalapos/corert,tijoytom/corert,sandreenko/corert,gregkalapos/corert,shrah/corert,tijoytom/corert,krytarowski/corert,botaberg/corert,krytarowski/corert,gregkalapos/corert,sandreenko/corert,shrah/corert