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