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