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