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