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