moved version-check to function
code-cleanup
Merge remote-tracking branch 'sdm/sdm' into dev