Merge "Fixed major sonar issues in MiscID"