Merge "Small fixes to changes related to PWLE implementation" into sc-dev