alert source fix
marid fixes
Merge branch 'dev'