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