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