[dali_1.9.3] Merge branch 'devel/master'