Sonar errors processed
Sonar errors processed
Sonar errors processed
Merge origin/master
Card: improved