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