Fix for STAR 9000653090 and STAR 9000651758