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