Merge "SONAR fixes - assert dissimiliar types"