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