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