Right fix for resolving overloaded class parameters: #SCL-4357
#SCL-5153 Fixed
#SCL-5023 Fixed