Optimizations

see: CDS-44908