Merge "Sonar Fix - Type Inference"