Merge "Fix sonar issues in models: sdc to vfc"