FOLLOW UP TICKET #213115 AND #213134

FOLLOW UP TICKET #213115 AND #213134

FOLLOW UP