Updates to make the dev branch of svarog compliant with sonar. Probably there's more to come this weekend
