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