Merge "Fixed SonarIssues Alerts to Bootstrap Notification"