BHV-14412: Optimized Code