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