tarakc02 Merge branch 'devel'